Commit Graph

131 Commits

Author SHA1 Message Date
Miniature
c612f91430 I am an idiot, fixing chemmaster runtime 2012-02-17 19:13:39 +10:30
Albert Iordache
0d19e9c7b3 Merge pull request #434 from Miniature/master
Added a thing to select pill and bottle sprites to the chemmaster
2012-02-16 08:21:13 -08:00
Miniature
9efde25a60 Added a thing to select pill and bottle sprites to the chemmaster
At some point I'd like to see bottles doing the same thing as beakers, where they show what chemicals are in them on the sprite. That however would involve messing with sprites and overlays and stuff, so I can't be bothered to actually do it at the moment. Just remember that this stuff will need to be changed for that.
2012-02-17 01:15:36 +10:30
SkyMarshal
8769fdd3fc Merge pull request #432 from Tastyfish/master
ported in a bunch of the old food making stuff
2012-02-15 19:11:30 -08:00
Tastyfish
c74c9b48e9 fix capsicum and frost oil to make sense 2012-02-15 14:46:35 -05:00
SkyMarshal
b5c1d99471 Added some more feedbacks on the blood_DNA stuff
Fixed up some chemistry stuff
Nitrogen now adds atmospheric nitrogen when splashed on the ground.
2012-02-14 21:34:52 -07:00
Tastyfish
badb7bd93f Merge remote-tracking branch 'upstream/master' 2012-02-14 12:01:14 -05:00
Tastyfish
12d119c109 porting old food stuff 2012-02-14 11:59:16 -05:00
SkyMarshal
3fbcbfe448 Merge pull request #416 from SkyMarshal/master
Bugfixes for Borg&Doors
2012-02-13 15:58:17 -08:00
SkyMarshal
42be0feff6 Bugfix for borgs&doors as well as chem grenades. 2012-02-13 16:56:34 -07:00
Miniature
006e91f4c1 Made dexalin and cloneoxadone use a slight amount of plasma, in addition to requiring it as a catalyst.
No, it doesn't make sense for oxygen being in the presence of plasma to transmute into dexalin.
2012-02-13 23:15:23 +10:30
SkyMarshal
1d29574bc3 Part 2 of the WIP chemistry stuff
Map update with secure doors!
2012-02-09 21:50:50 -07:00
SkyMarshal
90d47bccf9 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-09 16:29:31 -07:00
SkyMarshal
48453a3592 WIP work in making welding fuel not retarded
Chem grenades are now awesome again.
2012-02-09 16:29:06 -07:00
Tastyfish
2dc3a5cc6e fixed horribly buggy camera assembly 2012-02-08 20:56:04 -05:00
SkyMarshal
1f25c49c06 MOAR BUGFIXES 2012-02-05 21:56:12 -07:00
SkyMarshal
85ee6ae562 Fixed a warning with meteors, HAWK: COMPILE DAMMIT
Blood now works properly.
2012-02-05 11:52:42 -07:00
SkyMarshal
0e15736ba9 Fixes for gibber and detective computer.
Fixed some hallucination and fingerprint stuff.
2012-02-02 19:30:12 -07:00
SkyMarshal
2ed57e0cc6 Finished up the last parts of my fingerprints work. Added a rag which lets you smudge away prints, and sinks do the same.
Added hallucinations properly.
Added LSD (with hallucinations.)
Remapped slightly.
2012-02-02 00:35:48 -07:00
Albert Iordache
43d1d5aaab Merge branch 'master' of https://github.com/Hawk-v3/Baystation12 into Hawk-v3-master
Conflicts:
	code/modules/power/apc.dm
2012-02-02 08:50:33 +02:00
SkyMarshal
beffc2299a Final updates on Fingerprints
fix for traitors getting assassinate and protect targets for the same person
Ported blood rejection
2012-01-31 02:01:39 -07:00
SkyMarshal
6648061dcb MAJOR UPDATE: Detective/Fingerprints update
bugfix for wardrobes
blood type is now handled by datum/dna, and blood_DNA for atoms is a list of list, each sub list containing DNA and blood-type. (This allows multiple blood splatters)
added BS12 give command and explosives
Map update to remove blob spawn.
2012-01-31 02:01:38 -07:00
Hawk-v3
d10b9789a2 A change for next patch. 2012-01-30 18:39:57 +00:00
Albert Iordache
619afea38f Revert "water pipes base + pda support"
This reverts commit a591aef35c.
2012-01-27 10:06:12 +02:00
Tastyfish
07d989bbd7 Merge remote-tracking branch 'upstream/master' 2012-01-25 20:05:16 -05:00
Hawk-v3
27beb7f3fd ERT edits.
Changed the chemical amounts and added some info to each team's section, plus cloner and Cure Machine to Shuttle.
2012-01-25 23:17:04 +00:00
SkyMarshal
d61626440c Response Team Update:
-Response team now have a pimp'n base, containing gear for the leader as well as Medical, Engineering, and Security special loadouts.
-TG updates for comms and mulebot
-Special medical tools for response team
-Increased time between events slightly.
-Map updated with nerfed comm satellite, and added Death Alarms in medbay in addition to the new Response Team area.
2012-01-25 11:51:55 -07:00
Tastyfish
40dbc8a659 Merge remote-tracking branch 'upstream/master' 2012-01-24 15:47:07 -05:00
Tastyfish
a591aef35c water pipes base + pda support 2012-01-24 15:45:51 -05:00
cib
e2e1cecd7d Changes to medbots.
- They now have a mode, which is enabled by default, in which they only inject chemicals if the chemical helps with the target's damage.
- You can now load and unload them without access.
- Added a few beakers of tricordrazine to robotics, so they can load medbots when they make them.
2012-01-22 19:22:07 -08:00
Tastyfish
53baf4755f Merge remote-tracking branch 'upstream/master' 2012-01-16 20:27:36 -05:00
Tastyfish
df208f7189 added orderable chickens and cows 2012-01-16 20:26:17 -05:00
SkyMarshal
70cb3417ef Added weldpack, clipboards fit on belt, food and other things can now be wrapped 2012-01-12 11:13:05 -07:00
Tastyfish
f404ea91d6 Merge pull request #260 from SkyMarshal/master
Disposal updates + map fix, traitor objective fix, Cult teleport talisman now teleports grabs
2012-01-10 20:38:14 -08:00
SkyMarshal
3b57d309cc Disposals are now much more robust, with sorters being program-able, food able to be packaged, people able to flush closets, proper construction of sorters, and a function on taggers to use a custom tag.
In addition:
Made teleport talismans more amusing.
Fixed duplicate traitor objectives.
2012-01-10 21:21:52 -07:00
cib
0340e5f58e More medical changes.
- Added tramadol and oxycodone, both effective painkillers.
- Shock now takes drunkness into account.
- Added some firstaid stuff to the table in the medbay lobby, so people can do treatment when there's no doctors.
2012-01-10 09:16:11 -08:00
SkyMarshal
25426e6f02 Merge pull request #254 from SkyMarshal/master
Bugfix.
2012-01-09 09:08:53 -08:00
SkyMarshal
46fb684c0b Bugfix for chem grenades and Disposals. 2012-01-09 09:58:33 -07:00
Tastyfish
1d010aca75 Merge remote-tracking branch 'upstream/master' 2012-01-08 20:06:03 -05:00
cib
66330222d3 Buffed the speed at which the chemistry charger generates chemicals, and also the power consumption. 2012-01-07 20:39:35 -08:00
SkyMarshal
5fd641599e Fixed stupid unescapable edit apperance
Fixed some stupid with grenades.
2012-01-07 00:49:48 -07:00
Tastyfish
a7b85707dd porting in bones and dismemberment 2012-01-05 17:15:29 -05:00
cib
f7be1250a3 Many improvements to vira.
Implemented an efficient system for infection. Made sneeze and cough increase infection chance. Increased the lifespan of spaceacillin in a host. Removed the drool symptom.
2011-12-30 21:07:52 -08:00
cib
a902744264 A new breakthrough in quantum technology now allows you to convert energy to mass directly using the chem dispenser. Enabling this feature requires huge amounts of power, however. 2011-12-28 19:45:43 -08:00
SkyMarshal
aac7a104eb More amusing message. 2011-12-27 14:32:05 -07:00
SkyMarshal
03445062c4 Reworked pepperspray's results 2011-12-27 14:26:08 -07:00
SkyMarshal
25400f7af4 Should be the rest for this lot. 2011-12-27 14:13:11 -07:00
Albert Iordache
cfbb6eb704 Fixed a few errors. 2011-12-27 18:52:03 +02:00
cib
21876403bb Added new virology to the map. Radium now has a chance of awakening your immune system, but at the same time it has a chance of killing you. Added a dilluted milk recipe, and milk to the chem dispenser. 2011-12-26 01:26:35 -08:00
CIB123@gmail.com
42890a7c4a TG update: Added antibody-based, random symptom virology.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2686 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-27 00:01:02 +02:00