Zuhayr
6c53208115
Taser and examine fixes.
2013-07-29 16:50:37 -07:00
Zuhayr
2d45713d69
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2013-07-29 15:47:44 -07:00
Zuhayr
27d44c0e98
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-07-29 15:43:03 -07:00
meyar
1498c5748e
Camera's got lost in the shuffle.
2013-07-29 04:34:28 -04:00
meyar
de0c032486
Turns two ERT files into one. Also fixes the ERT admin button being bork.
2013-07-29 03:45:49 -04:00
Segrain
ea320dca67
Conflict fix?
2013-07-29 08:15:54 +03:00
Segrain
da2786891a
Fix for #3337 .
2013-07-29 08:12:02 +03:00
Zuhayr
ea9078830a
Merge pull request #3384 from SkyMarshal/airfixes
...
Fixes a bug with heat transfer.
2013-07-28 19:13:13 -07:00
SkyMarshal
cd72596249
Fixes a bug with heat transfer.
2013-07-28 19:11:05 -07:00
Zuhayr
af1f0108a2
Armalis pinning fix.
2013-07-29 07:06:55 -07:00
Zuhayr
08ff3df905
Vox gear tweaks. Dartgun buff, removal of tank sounds, addition of multitools.
2013-07-29 06:43:37 -07:00
Zuhayr
919dc1ae25
Added longer text to vox greeting message in Heist.
2013-07-29 06:39:43 -07:00
Zuhayr
8c3c26e2e8
Added cortical stacks for vox survival objective.
2013-07-29 06:36:55 -07:00
Zuhayr
c2e75f9ddb
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2013-07-29 06:05:00 -07:00
Segrain
fdce68fe66
Magboots fix.
2013-07-28 14:31:23 +03:00
Segrain
3c4b7507e9
Reactiveness 'quick'fix.
2013-07-28 13:02:10 +03:00
Kilakk
d7d84ff515
Added a deadchat toggle for all players.
...
* Both admins and regular players can toggle deadchat off
* Having deadchat on still requires you to be a ghost or an admin/mod to be able to /see/ deadchat
2013-07-27 22:54:30 -04:00
Zuhayr
e16d06d469
Merged setup.dm.
2013-07-28 08:46:10 -07:00
Zuhayr
168e334abd
Added BE_RAIDER pref to player setup and adjusted vox min player counts away from local testing values.
2013-07-28 06:05:22 -07:00
Zuhayr
0c88896adf
Adds a vox heist game mode. Fairly complex.
2013-07-28 05:18:04 -07:00
Zuhayr
a3ad055216
Merge pull request #3372 from Segrain/dev
...
Cameras update.
2013-07-27 15:42:04 -07:00
Segrain
47db87fcfe
Cameras for strike teams.
2013-07-28 01:59:03 +03:00
Zuhayr
012401b380
Merge pull request #3371 from Kilakk/dev
...
Fixes #3368 - Removed the (empty) medkits from ERT backpacks
2013-07-27 15:40:47 -07:00
Segrain
6ab1011e8e
Alarm cameras.
2013-07-28 01:25:55 +03:00
Segrain
914d072c86
Camera networks.
2013-07-28 00:58:18 +03:00
Segrain
726cf4abb0
Robotic cameras again.
2013-07-28 00:39:25 +03:00
Segrain
93955846fa
Robotic cameras.
2013-07-28 00:37:29 +03:00
Kilakk
b75d45814a
Removed the (empty) medkits from ERT backpacks
2013-07-27 16:05:55 -04:00
Segrain
0a30fe8ce2
Conflict fix. Again.
2013-07-27 21:51:38 +03:00
Mloc
1aed76d4c2
Merge pull request #3369 from softmix/dev
...
Made always random name respect gender
2013-07-27 04:59:37 -07:00
Mloc
94ec875852
Merge pull request #3364 from Kilakk/dev
...
Gave ghosts their own emote proc, added colorful text to distinguish emotes made by ghosts.
2013-07-27 04:59:16 -07:00
Zuhayr
d220e470ed
Antag creation button landmark fix.
2013-07-27 07:53:37 -07:00
Zuhayr
084b6cdfa3
Added a vox shuttle, maptool shenanigans.
2013-07-27 07:37:43 -07:00
Zuhayr
3227f669b1
Added a shuttle for the Vox to use.
2013-07-27 06:15:15 -07:00
Zuhayr
b8d13e1c7e
Merged robot.dm
2013-07-27 02:09:44 -07:00
Zuhayr
fdba632f88
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-07-27 01:12:27 -07:00
Peter Wall
5e91c569cc
Made always random name respect gender
2013-07-27 10:09:58 +02:00
Zuhayr
b0d8ee7861
Merge resolution.
2013-07-26 23:17:48 -07:00
Kilakk
f66e571696
Added /mob/dead/observer/emote()
...
* Added a proc to be called whenever a ghost emotes something
* Added emote_dead, which displays the *fancy* emote text to admins, mods, and those with M.stat DEAD
2013-07-26 23:04:49 -04:00
Kilakk
caf75bba7b
Fixes #3266 - Cell timers will no longer start automagically
...
* Cell timers will no longer start counting down automagically
* Made cell timers use world.timeofday instead of world.time
* Separated the countdown timer and the "set timer" controls
* You can now modify the cell timer without fucking up the countdown entirely
* Absolute paths, because
2013-07-26 14:26:09 -04:00
Zuhayr
1670ed8051
Fixes sprite reset issue for cyborgs, adds combat sprite to Secborg sprite choices.
2013-07-27 01:08:27 -07:00
Zuhayr
37aef47198
Nerfed the combat borg. Laser instead of cannon, cannon instead of plasma rifle. Added red alert check to crisis mode.
2013-07-27 00:48:50 -07:00
Zuhayr
c09d07bb82
Added tool steps to manually remove the bolts on a deployed nuclear weapon.
2013-07-27 00:09:19 -07:00
SkyMarshal
72c331bfa7
Several ZAS fixes.
...
Adds insulation to doors, modifiable by admins from the ZAS setting panel.
Fixes a logic error with connections. (I am dumb some days)
Improves the runtime detection and reporting.
Improves "zone info" debug verb.
2013-07-25 21:34:12 -07:00
Peter Wall
e599f125f4
Merge remote-tracking branch 'upstream/dev' into dev
2013-07-26 04:20:46 +02:00
Peter Wall
5f20459635
Fix for bots breaking if they fail to path
2013-07-26 04:08:09 +02:00
Mloc-Argent
9d2e107005
Reactiveness update part 1: Removed click delays from most objects, keeping them on for attacks and breaking windows/grilles.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-25 18:30:24 +01:00
Zuhayr
8124f7bfe7
Merge pull request #3352 from Mloc/zasfixes
...
ZAS fix. It should now be possible to repair breaches without admin int...
2013-07-25 06:40:21 -07:00
Peter Wall
e716e66d10
Made mechas able to bump-mine
2013-07-25 15:40:03 +02:00
Mloc-Argent
d02d50d0ce
ZAS fix. It should now be possible to repair breaches without admin intervention.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-25 14:31:31 +01:00
