comma
e45f429e4c
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
maps/tgstation.2.1.0.0.1.dmm
2013-08-04 01:40:32 +04:00
Alex
35e7ec3228
Allow cyborgs to hack vending machines
2013-08-03 14:08:27 +02:00
Segrain
c2712dd9d3
Fix for #3410 .
2013-08-01 20:58:35 +03:00
Segrain
8021250804
Type mismatch fix.
2013-07-31 10:32:19 +03: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
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
Zuhayr
c09d07bb82
Added tool steps to manually remove the bolts on a deployed nuclear weapon.
2013-07-27 00:09:19 -07:00
Segrain
85f82219ba
Fix for #3345 .
2013-07-25 03:03:14 +03: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
Mloc-Argent
f29cd5946f
Merge branch 'master' into bleeding-edge-freeze
2013-07-19 14:48:40 +01:00
LordBraindead
5d63943d07
Update mineral.dm
...
removed sheettpye = "plastic" again because it snuck back in after being removed already
2013-07-14 21:50:48 +02:00
LordBraindead
53c73f6b85
Update power_cells.dm
...
derped a debug message into the commit
2013-07-14 21:22:09 +02:00
LordBraindead
08d2e22220
fire update
...
enabled fire to destroy floors and objects
also tweaked the behaviour of glass to enable glasslocks against fire
also made fire extingiushers stop being useless
2013-07-14 21:20:45 +02:00
Zuhayr
dbe4838d40
Purging the toddler as Lord Mloc commands.
2013-07-13 04:34:09 -07:00
Spamcat
c27f3efb8e
Merge branch 'master' of github.com:Baystation12/Baystation12
2013-07-12 03:06:41 +04:00
Spamcat
4ceb12bb1c
Revert "Quickfix for INFINIMEAT."
...
This reverts commit 654a83be9d
2013-07-12 03:03:46 +04:00
Cael_Aislinn
4421bede17
moved money accounts into a global list + removed db syncing (some procs could be global but left where they are for convenience), fixed an issue with latejoiners having no account, fixed a runtime
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-07-12 03:40:06 +10:00
Chinsky
67cc13751a
Derp.
2013-07-11 02:09:01 +04:00
Mloc
e820e28f78
Merge pull request #3292 from comma/master
...
Fixes
2013-07-10 14:36:32 -07:00
comma
47c6901df3
Fixes #3018
...
Should stop intercept report from trying to tell that wizards, ninjas and nuke operatives are trending to be crew members ( they are not ).
2013-07-11 01:30:16 +04:00
comma
81e22ea270
Fixes wires on air alarm not displaying cut status properly.
...
Fixes #3087
2013-07-11 00:59:44 +04:00
comma
c791208efc
Made deconstruction/construction possible. Added hints ot examine since icon is same during whole process.
2013-07-11 00:18:03 +04:00
comma
45e775f5e9
Standardized proc definitions in alarm code.
2013-07-10 22:49:10 +04:00
comma
f1cfb96dab
Fixes #3225 . Adds separate toggle for LOOC.
...
Fixes #3285 . Changes way hearers are found, so it includes pAIs now.
Also adds (R) in front of LOOC messages that are sent by mobs not in view, for admins/mods, since it's quite disorienting.
2013-07-10 22:39:27 +04:00
comma
1a03079a66
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into viro
...
Conflicts:
maps/tgstation.2.1.0.0.1.dmm
2013-07-09 23:08:41 +04:00
Segrain
46df500cd4
Fix for #3166 .
2013-07-09 19:37:17 +03:00
fauxtada
c41abfc929
Edits contents of virology biohazard closets to be more virus resistant. Now with robust internals!
2013-07-09 07:02:17 -07:00
comma
722d4d27fb
Fixed a typo.
2013-07-09 16:07:58 +04:00
comma
d5942c4b10
Updated HUDs to find only known viruses.
2013-07-09 13:04:05 +04:00
comma
1095bd1978
Merge branch 'bleeding-edge-freeze' into viro
2013-07-09 12:49:23 +04:00
comma
ae2a9c56ad
Merge branch 'master' into bleeding-edge-freeze
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2013-07-09 12:48:34 +04:00
Segrain
c5a1a69b5b
Stealth/invisibility tweaks.
2013-07-09 05:06:29 +03:00
Segrain
72588c8c61
MedHUDs and virus2.
2013-07-09 04:51:09 +03:00
Spamcat
df90824d60
Whoa, 2 barsign.dm's? WTF?
2013-07-08 23:25:13 +04:00
Zuhayr
e9210b0701
Removed jobbanned and random pick drafting in understaffed modes, and implements voter-based forcedrafting.
2013-07-07 02:28:34 -07:00
Zuhayr
9a2ce35199
Commenting out ninja mode, as it is broken.
2013-07-06 21:53:11 -07:00
Zuhayr
9dec8e311c
Merge pull request #3252 from Segrain/bleeding-edge-freeze
...
Examining cyborgs.
2013-07-06 00:30:09 -07:00
Spamcat
5f690e150d
Part 3: fixing shit
2013-07-06 02:53:06 +04:00
Spamcat
63de302a09
Part 2: construction.
2013-07-06 02:53:03 +04:00
