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
10,253 Commits 8 Branches 0 Tags
314911e458d35df55d1782ebf4efbc996887d726
Commit Graph

557 Commits

Author SHA1 Message Date
cib
316af619f8 Rebalanced internal bleeding. 2012-11-21 22:42:20 +01:00
cib
6fbff77163 Re-nerf lung capacity due to problems with internals. 2012-11-21 22:41:35 +01:00
cib
e24d6ee902 Reduced internal bleeding speed. 2012-11-18 15:59:28 +01:00
Chinsky
ea4f34d53c Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/ZAS/FEA_system.dm
 2012-11-17 00:20:23 +04:00
Ater Ignis
137ed48938 clean out 2012-11-16 19:18:28 +04:00
Ater Ignis
a96e4c3600 if amputated full arm or leg, make hand or foot amputated too 2012-11-16 19:00:45 +04:00
Ater Ignis
4ed9b40cb9 tajarans see_in_dark -> 8, disembodied organs rendering correction 2012-11-16 18:41:26 +04:00
Chinsky
e6a2bb594b Reverted revert of my fix. No idea why I did that at all... 2012-11-16 18:28:09 +04:00
Ater Ignis
3d88251a3f limbs patch 
*don't drop limbs if already did that
*subraces icons for limbs
*left and right legs
 2012-11-16 17:12:17 +04:00
Ater Ignis
46bd2ce7e6 human icon generation update, tajarnan darkseeing 
*lying icon generated from standing one
*sprites for dismembering major races (tajarnan,skrell,soghun)
*tajarnans can see in darkness better than others
 2012-11-16 15:19:20 +04:00
Chinsky
750dc608fc Should prevent cloned Skrells and cats losing ears/tentacles after cloning. 2012-11-16 13:36:58 +04:00
Chinsky
c431877bf0 Made burns not cause internal wounds. 2012-11-16 12:18:28 +04:00
cib
7ae7099098 Ported autopsy. 2012-11-14 20:31:31 +01:00
cib
c96d245f2d Fixed a bug where all organs would heal always. 2012-11-14 18:01:55 +01:00
cib
397f010de5 Buff bandage healing speed. A LOT. 2012-11-14 16:51:58 +01:00
cib
450248864b Added lung rupturing and lung surgery. 2012-11-14 16:20:47 +01:00
cib
422ec63bfc Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/human.dm
 2012-11-13 19:01:03 +01:00
cib
c1fb2766b7 Increased the progression time for appendicitis and alien embryo. 2012-11-13 18:54:54 +01:00
cib
2eb4022fe4 Surgery now triggers specialized pain messages if not done with anesthetic. 2012-11-13 17:06:06 +01:00
cib
ef4ee093a5 Balance fixes to internal wounds. 
- Their damage now increases more slowly.
- They now cause faster bleeding.
- They can't be cured anymore with bicaridine etc.
 2012-11-13 16:01:43 +01:00
Chinsky
d5e8f90a9e Made virus crate spawn with virus2 samples instead of old ones. 2012-11-13 17:45:22 +04:00
cib
4b331f3676 Fixes to internal bleeding. 
- Created internal wound doesn't close instantly anymore.
- Small fix to body scanner display.
 2012-11-12 14:16:19 +01:00
cib
6d3e742992 Large amounts of damage can now trigger internal bleeding. 2012-11-12 13:38:55 +01:00
cib
95181d96a8 Several fixes to germs. 2012-11-12 13:17:11 +01:00
cib
e92cecdefe Added basic germ code. 
This will only trigger in surgery for now - That is when you cut someone open in surgery, you'd better wash your hands before, or otherwise you'll get infected wounds.
 2012-11-12 12:51:28 +01:00
Chinsky
18f56f4a38 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-09 14:32:49 +04:00
SkyMarshal
9b3389145e Fixed some runtimes with mulebots, the security computer, and the medical computer, as well as readded the nice prompt the cloner gives to ghosts when they are being cloned. Fixed an odd compile error. 2012-11-08 14:49:01 -07:00
Chinsky
47db4eded3 Can attach limbs now. No preparations needed yet. 2012-11-07 20:01:55 +04:00
Chinsky
4a9c7b82ae Commented out gibbing when torso takes too much damage. Because no one likes when you gib someone by poking knife in their chest enough times. 2012-11-06 16:37:16 +04:00
Chinsky
771389f871 Added warning messages before vomiting. 
You have in total two warnings and to react now.
 2012-10-31 14:36:09 +04:00
Chinsky
a2e83e962d Alternative titles system. 
Custom character records.
Different clothing for alternative titles.
 2012-10-31 08:40:51 +04:00
Chinsky
3583d78a45 Made stronger EMP pulses have BIGGER chance of exploding robolimb. It was backwards for some reason, so weak pulses had higher chance of explosion. 2012-10-30 07:56:43 +04:00
headswe
0d98248b6f Merge pull request #1821 from comma/master 
Pain & Other Ported Things
 2012-10-23 08:47:30 -07:00
Cael_Aislinn
9340f70252 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-22 19:35:03 +10:00
Chinsky
91b61f91e7 Readded pain and shock system. 
Tramadol and oxycodone are back too.
 2012-10-22 06:38:57 +04:00
Chinsky
7ae59ba6f7 Slapped a few nullchecks near reported runtimes. 2012-10-21 16:41:44 +04:00
Chinsky
52f9c0c9dc Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-21 05:52:18 +04:00
Chinsky
77d12b5e19 Added photos to security and medical records terminals. 
Generated during record creation, smaller version of char setup preview code.
 2012-10-21 05:45:36 +04:00
Cael_Aislinn
0f3f008ff6 mergefixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 02:22:06 +10:00
Cael_Aislinn
01d3e3bf79 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	code/datums/disease.dm
	code/modules/reagents/Chemistry-Reagents.dm
	icons/turf/areas.dmi
	maps/tgstation.2.0.9.1.dmm

yep, this time going to merge map updates before making map changes >.>

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 01:25:04 +10:00
Cael_Aislinn
2f853fe23a Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/devices/radio/radio.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/say.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/paperwork/paperbin.dm
	html/changelog.html
	icons/turf/areas.dmi
	maps/RandomZLevels/assistantChamber.dmm
	maps/RandomZLevels/fileList.txt

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 00:25:05 +10:00
cib
0849907dae Fixed another bug with anti-revolution. 2012-10-19 10:35:54 -07:00
cib
bf3e910a12 Merge branch 'master' of github.com:CIB/Baystation12 2012-10-19 10:17:02 -07:00
cib
bf83e5c3ba Added a new mode: anti-revolution 2012-10-19 10:00:54 -07:00
cib
3c912718e9 Fixes retrovirus bug where it wasn't curable. 2012-10-19 13:50:49 +02:00
cib
e103cc799e Fixes a runtime. 2012-10-18 15:22:54 +02:00
cib
d90944ad50 Several medical related changes. 
- There's now internal wounds
- Appendicitis stage 4 causes internal wounds
- Added back the body scanner
 2012-10-18 12:39:04 +02:00
Head
59964d4025 Whoops forgot a thing also reenabled a warning message but with a added check 2012-10-17 19:00:20 +02:00
baloh.matevz@gmail.com
137535fbbe Fixed a wrongly put rank check for the proc that makes antagonists. Admins will now once again be able to use the 'show traitor panel'. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4902 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-17 11:20:57 +00:00
giacomand@gmail.com
3b95730028 -Committed RavingManiac (Smoke Carter)'s Roros laying eggs. 
http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=10501
-You can insert the Auth Disk by clicking on the nuclear bomb.
-Changed how aliens are selected. It will filter the list of possible candidates by checking for players who aren't inactive for more than a minute. If no possible candidates are found, it increases the filter by another minute. It does this 5 times before giving up.
-Alien embryos cannot have carriers and they are more likely to infect someone.
-The time it takes before a larva bursts is increased a bit.




git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4897 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-17 06:04:25 +00:00