Commit Graph

2972 Commits

Author SHA1 Message Date
Erthilo
070cb50f8d PDAs can be used when buckled (and not in any other way restrained or stunned). Rejuvenate now completely heals a target or broken organs and viruses too. 2013-08-11 17:13:58 +01:00
Segrain
935a7f30ea Typo fix. 2013-08-11 09:22:20 +03:00
Zuhayr
840468cb14 Fixed the order of update/return statements for dispenser. 2013-08-08 23:17:38 -07:00
Zuhayr
23301d9b73 Made dispensers unwrenchable. 2013-08-08 22:56:31 -07:00
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
Zuhayr
a470444963 TEMPORARY fix for the too-many-strings RSC corruption issue. 2013-08-03 09:21:53 -07:00
Zuhayr
618afa1be7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2013-08-03 09:16:41 -07:00
Zuhayr
a8c04cefc6 Merge. 2013-08-03 09:14:20 -07:00
Segrain
d51809faa2 Separating autoinjectors box from injector box. 2013-08-02 19:30:02 +03:00
Segrain
c2712dd9d3 Fix for #3410. 2013-08-01 20:58:35 +03:00
comma
95f00d0523 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into medtweaks 2013-08-01 10:03:46 +04:00
comma
bbdcb81868 Added advanced medikits. 2013-08-01 09:58:09 +04:00
comma
c8f5b98a95 Autoinjectors.
Now they are one-use, as they were intended.
You can still change their contents with syringes before they are used.
To mitigate their one-use nature, box of them is added to medical closets and supply pack.
2013-08-01 08:12:56 +04:00
comma
8735254b87 Moved code from parent class with checks to subclasses.
Lots of copypaste code, but better that bloating that one main function even more IMHO.
As for bloat reason - readded advanced medithingies. Work same as lesser ones, but heal some damage directly instead, and have different messages/
2013-08-01 05:53:48 +04:00
Segrain
c8381b6e90 Pipe painter addition. 2013-07-31 14:23:30 +03:00
Kilakk
bd6b9cceeb Removed the tcomms server for the non-existant mining channel. 2013-07-30 17:39:02 -04: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
Zuhayr
08ff3df905 Vox gear tweaks. Dartgun buff, removal of tank sounds, addition of multitools. 2013-07-29 06:43:37 -07:00
Zuhayr
8c3c26e2e8 Added cortical stacks for vox survival objective. 2013-07-29 06:36:55 -07:00
Segrain
726cf4abb0 Robotic cameras again. 2013-07-28 00:39:25 +03: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
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
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
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
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
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
Spamcat
df90824d60 Whoa, 2 barsign.dm's? WTF? 2013-07-08 23:25:13 +04: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
Spamcat
0e4271f97c Stage 1: deconstruction. 2013-07-06 02:53:01 +04:00
Spamcat
87feed7e7b Nice colours (and a minor bugfix) 2013-07-06 02:53:00 +04:00
LordBraindead
ff912e132b readjusted composition of syndie bombs
set them to produce a 1-2-5 explosion for the fire changes
2013-07-05 19:55:28 +01:00
Segrain
5abed5a5f6 Modtype tweak. 2013-07-05 20:10:39 +03:00
LordBraindead
ba15e0f515 readjusted composition of syndie bombs
set them to produce a 1-2-5 explosion for the fire changes
2013-07-05 09:06:34 +02:00
Zuhayr
1750f1e631 Merge pull request #3244 from Ispil/Staging
Fixes issue #3240. The order for visible_message is visible, person, aud...
2013-07-04 23:09:44 -07:00
Ispil
255408c026 Fixes issue #3240. The order for visible_message is visible, person, audible. Here, visible and person were reversed. 2013-07-04 21:13:33 -07:00
Spamcat
24eddd6eaa Now 100% more machinery! 2013-07-05 04:12:41 +04:00
Zuhayr
b4695d3d74 Merge pull request #3232 from Ravensdale/master
Custom synthetic sprites and minor bugfixes
2013-07-03 22:21:15 -07:00
Ravensdale
9aedfa8b23 Bugfix: Fixes mining borg's radio to the supply frequency since mining frequency no longer exists.
Feature: Introduces and adjusts code for cyborg and AI custom sprites

Cleanup: Streamlined the AI core selection code. Could probably be even cleaner but it's good for now.
2013-07-03 21:24:25 -07:00
Ispil
88791eec5c Makes the Crew Manifest default on all PDAs, and removes the access_manifest variable from cartridges. Also moves the manifest function into the PDA code, instead of cartridge code. 2013-07-02 19:14:10 -07:00