Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Botcall, TG edition! #4974

Merged
merged 9 commits into from Oct 29, 2014
Merged

Botcall, TG edition! #4974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
589c1f4
Botcall, TG edition!
GunHog Sep 25, 2014
c4375a5
Minor fixes + Floorbot improvement
GunHog Sep 25, 2014
6d734c0
Movement rebuilding and bot changes, Pt 1.
GunHog Oct 16, 2014
cd3ec2e
Movement rebuilding and bot changes, Pt 2.
GunHog Oct 21, 2014
20bd997
Merge remote-tracking branch 'remotes/upstream/master' into Botcall_T…
GunHog Oct 21, 2014
8f4e6fc
Merge conflict resolution - resolution
GunHog Oct 21, 2014
921143c
ED-209 balance changes and bot tweaks
GunHog Oct 22, 2014
63b2fc2
Merge remote-tracking branch 'remotes/upstream/master' into Botcall_T…
GunHog Oct 22, 2014
7479e40
Add the Kinetic Accelerator to safe list
GunHog Oct 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions code/_onclick/ai.dm
View file
Open in desktop
Expand Up @@ -58,6 +58,10 @@
aicamera.camera_mode_off()
aicamera.captureimage(A, usr)
return
if(waypoint_mode)
set_waypoint(A)
waypoint_mode = 0
return

/*
AI restrained() currently does nothing
Expand Down
3 changes: 3 additions & 0 deletions code/game/communications.dm
View file
Open in desktop
Expand Up @@ -176,6 +176,9 @@ var/const/RADIO_AIRLOCK = "6"
var/const/RADIO_SECBOT = "7"
var/const/RADIO_MULEBOT = "8"
var/const/RADIO_MAGNETS = "9"
var/const/RADIO_CLEANBOT = "10"
var/const/RADIO_FLOORBOT = "11"
var/const/RADIO_MEDBOT = "12"

var/global/datum/controller/radio/radio_controller

Expand Down
666 changes: 634 additions & 32 deletions code/game/machinery/bots/bots.dm
View file
Open in desktop

Large diffs are not rendered by default.