cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,627 Commits 9 Branches 0 Tags
f4193383c8a60e3f248b7059a1941a820c875dd5
Commit Graph

7382 Commits

Author SHA1 Message Date
Asanadas
f4193383c8 Compile fix 
Signed-off-by: Asanadas <asanadas@hotmail.com>
 2012-10-16 21:26:36 -04:00
Asanadas
e2abd0a9b8 Commented out BoH on BoH Singulos. 2012-10-16 20:52:28 -04:00
Asanadas
d6d1380b53 What is this thing? Why do we need it? Why does it spam so much? 
Signed-off-by: Asanadas <asanadas@hotmail.com>
 2012-10-16 20:51:04 -04:00
cib
848355292a Fixed bug with RP rev where anyone could become head rev, even non-revs. 2012-10-16 19:36:39 +02:00
cib
14805c3bf2 Added RP revolution. 2012-10-16 19:28:54 +02:00
cib
7fccadfc89 Ported AutoTraitor. 2012-10-16 18:44:53 +02:00
Mloc
a9e43389e6 Merge pull request #1773 from pobiega/master 
Bandaging already bandaged wounds. Fixes issue #1772
 2012-10-16 01:48:04 -07:00
Pobiega
8991f73efc Fixes issue #1772, bandaging already bandaged wounds. 2012-10-16 10:35:13 +02:00
DarkTechnomancer
981481ca56 Fixed nutrition-related messages showing up twice in the examine verb and ported pulling damage back in. 2012-10-16 00:10:40 -04:00
headswe
f296f9c3c8 Merge pull request #1761 from caelaislinn/bs12_with_tgport 
misc merge things
 2012-10-15 10:59:58 -07:00
headswe
3e94d7a682 Merge pull request #1768 from CIB/master 
Bleeding fixes
 2012-10-15 10:59:27 -07:00
headswe
931cf50bdc Merge pull request #1769 from comma/master 
Reagent code cleanup and slur
 2012-10-15 10:58:47 -07:00
cib
874d2c1519 Health analyzer now shows if an organ is bleeding. 2012-10-15 19:54:17 +02:00
cib
8f2055080d Increased blood pack volume and IV injection rate. 2012-10-15 19:48:20 +02:00
cib
21d0619cf5 Blood packs now are faster on the IV than other chemicals. 2012-10-15 19:23:57 +02:00
cib
150d7e51b5 Added some medical stuff to the map. 
Also added blood packs.
 2012-10-15 19:17:38 +02:00
Chinsky
468752ea6d Ported BS12 slur. 
Sorta. Can't use html in said strings, so it will look a bit different.
 2012-10-15 20:14:34 +04:00
Chinsky
514989394f Cleaned up food and drinks code. 
God bless OOP.
 2012-10-15 20:13:35 +04:00
cib
a577c0bfac Fixed a few bugs with IV drips. 2012-10-15 18:01:31 +02:00
cib
82dca5a4a0 Added an IV drip machinery. 2012-10-15 17:19:43 +02:00
cib
6ca73039fb Wounds now bleed only until a certain stage. 2012-10-15 15:27:10 +02:00
cib
19846abebe Halved bleeding speed. 2012-10-15 15:13:49 +02:00
cib
8b630d9b49 Merge github.com:Baystation12/Baystation12 2012-10-15 15:06:21 +02:00
headswe
b24b176a44 Merge pull request #1767 from comma/master 
Dammit.
 2012-10-15 05:50:36 -07:00
Chinsky
ad34ad9da4 God dammit, fix. 2012-10-15 16:48:13 +04:00
headswe
6b4593a80c Merge pull request #1765 from comma/master 
Surgery.
 2012-10-15 04:49:42 -07:00
headswe
28e38cd590 Merge pull request #1766 from headswe/master 
Runtime
 2012-10-15 04:47:23 -07:00
headswe
3e0ac92456 Merge pull request #1763 from Ravensdale/master 
Cargo atmos systems adjust
 2012-10-15 04:46:35 -07:00
Cael_Aislinn
d38cf3da27 re-enabled alien player's hair and facial hair 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-15 21:43:40 +10:00
Head
ad0be72f88 Fixed runtime. 
Signed-off-by: Head <sebbebroberg@hotmail.com>
 2012-10-15 13:32:58 +02:00
Chinsky
1bcfdfbd98 Now lighters only burn hand user is holding them. Bye bye, 80% of crew groin burns. 2012-10-15 15:30:42 +04:00
Chinsky
385dbe9fe9 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-15 15:13:57 +04:00
Chinsky
eb6d63cc07 Should be everything for surgery for now. 
-Fixed some more messages.
-Added that if you try to set not broken bone with bone setter, you won't like the result
-Moved code for fracturing bones to the separate proc.
 2012-10-15 15:13:34 +04:00
Cael_Aislinn
e00a696a40 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-10-15 20:57:54 +10:00
DarkTechnomancer
b99dae5c89 Fixed health analyzers 2012-10-15 02:57:48 -04:00
DarkTechnomancer
a6aa56707a Fixed machine building prompts 2012-10-14 23:05:58 -04:00
Ravensdale
f844b7baca Raises cell timer cap from 10min to 60min 2012-10-14 17:52:06 -07:00
Chinsky
988928b086 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-15 01:52:02 +04:00
Chinsky
44675fb12e Surgery was working, yes yes, but not good enough, no. 
Must stay true to the System, yessss.

Aside form fixing lots of mix ups with who cuts who in messages, separated some steps in their own datums.
-mending skull from setting bone (different message and different failure penalty)
-incising eyes and face (2 separate steps) from generic incising (different start condition (eyes), different messages, different failure penalties)
-cautering eyes and cautering face (2 separate steps) from generic cautering (different messages, different effects on success, different penalties on failure)

COuld have realized them as cascade of ifs in generic steps, but though this way will be more in spirit of step system, and generally a bit more readable, if longer.
 2012-10-15 01:50:22 +04:00
Asanadas
840ed30875 Fixed a spelling error in the Jensen HoS coat. Sponsored by tasty Trenchoats. 
Signed-off-by: Asanadas <asanadas@hotmail.com>
 2012-10-14 15:04:00 -04:00
Asanadas
1fcaf5b376 Nerf cheap lighters. 
Signed-off-by: Asanadas <asanadas@hotmail.com>
 2012-10-14 14:42:08 -04:00
Chinsky
8427947bd7 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/datums/organs/organ_external.dm
	code/modules/mob/living/carbon/human/human.dm
 2012-10-14 20:39:26 +04:00
Chinsky
9befbd6aa9 Surgery done. 2012-10-14 20:31:07 +04:00
Cael_Aislinn
d5a4a268d7 moved mod panel to a new file, removed the admin stuff from it 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-14 14:31:45 +10:00
Cael_Aislinn
4e08f61642 made the alien player limit a config option 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-14 13:59:50 +10:00
headswe
10f32d1351 Merge pull request #1760 from DarkTechnomancer/master 
Fixed flavor text
 2012-10-13 20:10:18 -07:00
DarkTechnomancer
4bf6833a62 Fixed flavor text 2012-10-13 19:27:43 -04:00
headswe
c04c26fa29 Merge pull request #1759 from headswe/master 
Fixed Organspam (Maybe)
 2012-10-13 15:44:42 -07:00
Head
085d357b4b Hopefully fixed organ spam. 2012-10-14 00:43:23 +02:00
Chinsky
c3b53af100 Commiting for the night, in case KGB steals my laptop. 
Pretty much finished surgery system.
-working appendectomy, bone surgery, eye surgery, face surgery, brain surgery (humans only) and metroid core surgery.

-moved operation stages tracking vars to one op_stage datum. Left brain opstage var alone because way too many things reference it.

-added bone gel and bone setter.

-added check for surgery tools, so new doctors won't beat shit out of patients on optable too often.

-pretty much emptied surgery_tols.dm, it was unneeded by this point.

Still need to test it more, slap sanity checks everyfuckingwhere.
Also more literate messages written with help of trained monkey (faux).
 2012-10-14 02:15:23 +04:00