cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,790 Commits 8 Branches 0 Tags
a4e5bad4098b901bab0594fccf921ebaf831e4fe
Commit Graph

374 Commits

Author SHA1 Message Date
Asanadas
3be319a555 Merge pull request #2967 from comma/master 
Drugs and Surgery fixes
 2013-06-04 10:19:59 -07:00
Spamcat
c5a57ccdc4 Runtime fixes, tweaks. 2013-06-04 16:25:41 +04:00
Chinsky
0ad08b13cc Fixes #2954 
Winners do no use Space Drugs to escape from cuffs.
 2013-06-04 13:14:51 +04:00
Chinsky
40e8d9b792 Fixes radium not producing cures for virus2. 2013-06-02 23:58:29 +04:00
Chinsky
2cafa9f77b Merge branch 'bleeding-edge-freeze' into lids 2013-06-01 14:50:26 +04:00
Chinsky
4749d6016d Made syringe gun work with aiming system. 2013-06-01 08:23:38 +04:00
Chinsky
f9b0ba7a49 Added lids for bottles and beakers. 
Click on vessel in hand to put lid on / take it off.
Lids prevent use of syringes and spilling.
 2013-05-26 06:38:38 +04:00
VitrescentTortoise
afb49c05d9 Fixed lemonjuice showing up as ..what? 2013-05-25 12:52:56 -07:00
cib
670bf5bb76 Radiation storms consider maintenance now. 
Also, a fix to spray(whoops!)
 2013-05-18 22:18:37 +02:00
cib
d7cc42e588 Added wallrot event. 
Also some updates to changelog.
 2013-05-18 21:55:02 +02:00
Mloc-Argent
27759f47df Merged master into BEF. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-05-06 15:43:50 +01:00
Spamcat
0acd40326f Increased pill bottle capacity to 14 pills (2 rows). 
Also fixed #2714.
 2013-04-30 15:44:31 +04:00
jediluke69
a87a2abb37 Milkshakes and Rewriter should now have effects 2013-04-27 20:15:12 -04:00
jediluke69
e54b172a09 fixes my silly mistake on drink results... 2013-04-27 19:53:38 -04:00
jediluke69
85eb0f1224 Adds new drinks and fixes a few things 2013-04-24 18:49:01 -04:00
fauxtada
c1991ba0dd Player Requests Edition 
- Two canes will spawn in medbay storage for people with leg injuries.
- Added some more welding goggles for engineers in engineering.
- Armory has a second security hardsuit.
- CMO has hallway access to the medbay hardsuits.
- HoS hat spawns in HoS closet.
- White wedding dress spawns in chaplain closet.
- Removed Pulse Rifle and Laser Canon from ERT room.
- Detective's office will now start off with a cigeratte pack and a detective's flask.
- Three normal boring flasks now spawn behind the bar for the bartender to give out.
- Old Man Suit spawns in laundry room. - Requested by Book.
- Roaper's Callum suit ( http://baystation12.net/forums/viewtopic.php?f=33&t=7047 ) now spawns in under Knockoff Suit. It may or may not spawn in for him too, I don't know how this shit works but I think I got it right.
- Removed Roaper's items for Ian Colm. At least the code part, I don't know if I'm supposed to delete the DMIs or not so I left them in.
 2013-04-24 03:04:35 -07:00
NerdyBoy1104
390029007d Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from. 2013-04-23 22:52:08 +01:00
SkyMarshal
96cefa4397 Compile fix. 2013-04-18 09:56:52 -07:00
SkyMarshal
710e97bcc6 fuel is now a bit less derpy. Napalm produces volatile fuel, and less of it. Fire consumes more welding fuel. 2013-04-18 09:56:52 -07:00
SkyMarshal
81c0c5cb6d Napalm can now be made, due to fire changes. 2013-04-18 09:56:51 -07:00
Asanadas
2272fbe255 Mixing napalm is incredibly broken with ZAS / not found on our wiki because it's a "secret recipe" so I figure let's just comment it out. 2013-04-18 09:56:50 -07:00
SkyMarshal
f05b8e0083 Fixes issues: 
#2632 Fire Issues (Fire doors work, Flamethrower reverted to making a flamethrower liquid fuel subtype, flame grenades now make a puddle of welder fuel that is lit aflame with napalm)
#2630 (The code has been calling (turf).temperature_expose when it was supposed to be hotspot_expose), #1865 (aqain)(Added a check to remove trace gas fuel under a certain point).
Also: added a flashpoint value for plasma, which is the temperature at which it self-ignites (Currently 246C or 519K which is equal to gasoline)
Partial-tile firedoors now default to full-tile firedoors as the part-tile ones were breaking ZAS zones entirely.  Possible cause of #2627 and maybe #2451, but those need tested and I did not have time.
 2013-04-18 09:56:49 -07:00
SkyMarshal
c63dc0f962 Compile fix. 2013-04-11 12:19:35 -07:00
SkyMarshal
221901ba3a fuel is now a bit less derpy. Napalm produces volatile fuel, and less of it. Fire consumes more welding fuel. 2013-04-11 12:14:47 -07:00
SkyMarshal
9176901c11 Napalm can now be made, due to fire changes. 2013-04-11 11:50:29 -07:00
Asanadas
778211d482 Mixing napalm is incredibly broken with ZAS / not found on our wiki because it's a "secret recipe" so I figure let's just comment it out. 2013-04-09 18:34:14 -04:00
SkyMarshal
7d114d22bd Fixes issues: 
#2632 Fire Issues (Fire doors work, Flamethrower reverted to making a flamethrower liquid fuel subtype, flame grenades now make a puddle of welder fuel that is lit aflame with napalm)
#2630 (The code has been calling (turf).temperature_expose when it was supposed to be hotspot_expose), #1865 (aqain)(Added a check to remove trace gas fuel under a certain point).
Also: added a flashpoint value for plasma, which is the temperature at which it self-ignites (Currently 246C or 519K which is equal to gasoline)
Partial-tile firedoors now default to full-tile firedoors as the part-tile ones were breaking ZAS zones entirely.  Possible cause of #2627 and maybe #2451, but those need tested and I did not have time.
 2013-04-09 00:49:19 -07:00
Asanadas
f3e1ff57d6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-04-04 01:15:03 -04:00
Spamcat
e1604d08d8 No more ninja munching. 2013-04-03 20:54:00 +04:00
Spamcat
6f1b9a44ab Virology is working again. 2013-03-28 18:23:30 +04:00
Asanadas
f3d605abe3 De-Culting and you! Null Rods re-receive the ability to de-cult cultists, and a tiny desc change. Holy Water also has the chance to de-cult on metabolism, but less of a chance than the null rod. Holy Water may need some balance adjustments, will watch it in the future. 
Signed-off-by: Asanadas <asanadas@hotmail.com>
 2013-03-27 19:45:40 -04:00
Spamcat
7bd9bf57c0 Nerfed syringestab. 
Again.
 2013-03-26 13:26:59 +04:00
Spamcat
71031c2470 Chemmaster puts pills in pill bottles. 2013-03-26 13:24:35 +04:00
Spamcat
47606f0142 Whoops... 
fixed the fix
 2013-03-20 18:58:01 +04:00
Spamcat
3b0c07d232 Removed unneeded message when feeding people. 
hacky-hacky
 2013-03-20 13:17:55 +04:00
Spamcat
d4275b5ab4 Made syringe guns reject broken syringes. 2013-03-20 12:43:29 +04:00
Spamcat
76720abd6f Merge branch 'BEF-staging' of github.com:Baystation12/Baystation12 into BEF-staging 2013-03-19 11:17:32 +04:00
Spamcat
5e2c921933 Fixed nanopaste messages. 
(and some my shitcode)
 2013-03-18 18:01:51 +04:00
Cael_Aislinn
dc017d6cce Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-18 01:08:45 +10:00
Christian Bielert
14a96f77ab Merge pull request #2539 from comma/organ 
Organ code restructuring
 2013-03-16 07:10:40 -07:00
Cael_Aislinn
38d30122e2 re-add holy water reagent 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-16 20:38:01 +10:00
Cael_Aislinn
435ceda41f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 20:37:35 +10:00
Chinsky
38a8246994 Moved code for injecting and taking blood to separate procs. 
Removed special case for blood from regent transferring proc.
Fixed humans spawning as limbles torsos.
 2013-03-14 20:18:37 +04:00
Chinsky
a4581cc1d8 Derp, accidentally deleted OD for chloral way back. 
( c4997a34f1 )
Fixed now.
 2013-03-12 08:40:47 +04:00
Cael_Aislinn
f8f9397636 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	icons/obj/library.dmi
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 23:01:33 +10:00
Cael_Aislinn
7de4093060 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-09 23:41:53 +10:00
Cael_Aislinn
b13c634293 added bee stuff, will post documentation for it on the forums. features include: place an apiary on a hydro tray to cultivate bees, bees auto breed and spread (if they have enough food), bees give slight accumulative boosts to nearby plants, bee hives produce honey and honeycomb added manual to explain beekeeping, rampaging bees can do a lot of damage but anything with bio protection will reduce likelihood of being stung 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-09 23:38:54 +10:00
Spamcat
39d01d4310 Nerfed syringestab, made it produce a broken syringe with fingerprints and stuff, so tater will need to thing about evidence disposal. 2013-03-09 13:51:05 +04:00
Cael_Aislinn
0481c1eb3f reagent data is properly preserved over chemical reactions 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 19:49:57 +10:00
Cael_Aislinn
53793fc2aa Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 19:03:18 +10:00