Zuhayr
b4e8c60472
Merge resolution.
2013-07-31 19:21:58 -07:00
Zuhayr
8008a27ec4
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2013-07-31 18:54:45 -07:00
Zuhayr
f50256eabb
Work progresses on species datums. Mass-commit due to repo issues requiring a reset.
2013-07-31 11:50:56 -07:00
Segrain
8021250804
Type mismatch fix.
2013-07-31 10:32:19 +03:00
Segrain
bd6c5f4b30
Removing internal cameras again.
2013-07-31 05:43:23 +03:00
Chinsky
36619656b8
Merge pull request #3395 from Zuhayr/feature
...
Podman rewrite, icons. Fixes from master. ERT stuff from Meyar.
2013-07-30 14:47:55 -07:00
Zuhayr
76e18b0ebe
Derp, compile fix.
2013-07-31 04:49:15 -07:00
Zuhayr
486f46d71e
Moved around podmen code, adjusted a lot of strings, rewrote/modified a lot of the podman generation code, added podman icons, commented out potato person green tint.
2013-07-31 04:17:17 -07:00
Zuhayr
361ecb4e2b
Merge resolution.
2013-07-30 17:33:18 -07:00
Kilakk
bd6b9cceeb
Removed the tcomms server for the non-existant mining channel.
2013-07-30 17:39:02 -04:00
Kilakk
e9b8269e13
Adds colored department radio channels.
2013-07-30 17:38:34 -04:00
Erthilo
89ffc92168
Fixes text errors in ghost manifest runes and newscasters with apostrophes.
2013-07-30 22:36:42 +01:00
Erthilo
9bbf43407f
Fixes Gravitational Catapult not detaching.
2013-07-30 20:06:37 +01:00
Segrain
24bc26fd13
Fix for table/computer cross-detection.
2013-07-30 19:13:42 +03:00
Kilakk
3f172dcd08
Changed ERT headsets to correctly show the Supply channel
...
* ERT headsets now (correctly) show the Supply channel rather than the two non-existant Cargo/Mining channels.
2013-07-29 22:31:47 -04: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
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
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
Segrain
47db87fcfe
Cameras for strike teams.
2013-07-28 01:59:03 +03: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
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
fdba632f88
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-07-27 01:12:27 -07:00
Zuhayr
b0d8ee7861
Merge resolution.
2013-07-26 23:17:48 -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
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
Jamini
920b855f6c
Added employment records.
...
Added employment records console.
Added circuit for employment records.
Added employment records consoles to every head of staff office. (Map)
Added a circuit spawn for an employment console in tech storage (Map)
Fixed pod 5.
Signed-off-by: Jamini <mobiousjami@gmail.com >
2013-07-24 22:23:50 -04:00
Segrain
85f82219ba
Fix for #3345 .
2013-07-25 03:03:14 +03:00
RusskiSam
df8c6cdbcf
Added engineering tape roll to CE closet.
2013-07-24 07:27:06 -07:00
RusskiSam
74f951ed75
HoS and Warden's closets get police tape roll.
...
Tape rolls are now available for all security jobs.
2013-07-24 07:20:31 -07:00
RusskiSam
b3e5bbdc14
Adds police tape roll to Detective's Cabinet.
...
Signed-off-by: RusskiSam
2013-07-24 04:28:03 +04:00
Kilakk
1ba49d17cb
Made it so auto- and admin-ERT crosscheck each other
...
This avoids having an admin call an ERT and then having the auto call
a second ERT on its own
Also added a check to abort ERT if not enough people sign up (members_required is currently 1)
2013-07-22 16:53:48 -04:00
Kilakk
8766e4154d
Changed the list of p_stats available in medical records
...
Made it so removing an ID card from the medical computer puts the ID into your hand rather than onto the computer
List:
Active, *SSD*, *Deceased*, Physically Unfit, Disabled
2013-07-22 15:10:25 -04:00
Mloc-Argent
bdaabaec46
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev
2013-07-22 14:42:50 +01:00
Zuhayr
15f0853ea2
Merge pull request #3331 from BcTpe4HbIu/airalarm_fix
...
Airalarm fix
2013-07-22 04:04:00 -07:00
Igor Golubkov
3889716dd6
Fix Issue #3327
2013-07-22 10:26:48 +04:00
Mloc-Argent
c135d19b66
Partial fix for #2284 .
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-21 17:05:10 +01:00
Mloc-Argent
eef12bf252
Fixes #3324 .
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-21 15:03:49 +01:00
Mloc-Argent
8575b7a286
And once again, did that the wrong way around. Whoops.
...
Fully reverts #3316 .
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-20 18:41:50 +01:00
Mloc-Argent
adc3c14779
Revert #3316 from BEF due to compile errors and (assumed) missing files.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-20 18:38:00 +01:00
