cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 10:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,588 Commits 9 Branches 0 Tags
c5301c51449fd2ac3cb0d951a201390d62ed00b0
Commit Graph

68 Commits

Author SHA1 Message Date
Chinsky
fcb10b05d5 Should fix injured icons not updated. 2013-01-28 21:51:05 +04:00
Chinsky
d0ae053098 Should stop robolimbs bleeding. 2013-01-23 02:47:37 +04:00
Chinsky
c0fc8f965b Added doublecheck for disfigurement 2013-01-13 11:52:41 +04:00
Chinsky
3447c61e49 Moved surgery from WIP to modules, since it's not really that WIP anymore. 
Split one huge file into several smaller ones for readability.
 2013-01-13 02:11:06 +04:00
Chinsky
b5da64d10e Fixed eternal disfigurement (got quite spammy in fires) 2013-01-11 00:29:10 +04:00
Cael_Aislinn
7efc1aafef Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	icons/turf/areas.dmi
	maps/RandomZLevels/stationCollision.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-07 22:26:24 +10:00
Cael_Aislinn
aae42d928a Merge branch 'incremental_tg' r5200 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/__HELPERS/type2type.dm
	code/__HELPERS/unsorted.dm
	code/datums/datumvars.dm
	code/datums/disease.dm
	code/datums/organs/organ_external.dm
	code/datums/supplypacks.dm
	code/defines/obj.dm
	code/game/area/areas.dm
	code/game/atoms.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/hud.dm
	code/game/jobs/access.dm
	code/game/jobs/job/civilian.dm
	code/game/machinery/alarm.dm
	code/game/machinery/cloning.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/medical.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/objects/effects/decals/contraband.dm
	code/game/objects/effects/signs.dm
	code/game/objects/items/devices/PDA/PDA.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/game/objects/items/weapons/photography.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/window.dm
	code/game/sound.dm
	code/game/verbs/ooc.dm
	code/global.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/DetectiveWork/footprints_and_rag.dm
	code/modules/DetectiveWork/scanner.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminhelp.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/awaymissions/gateway.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mint.dm
	code/modules/mining/ores_coins.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/alien/alien.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/say.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/mob/new_player/login.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/mob/new_player/savefile.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photocopier.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/setup.dm
	code/unused/mining/datum_processing_recipe.dm
	code/unused/powerarmor/powerarmor.dm
	code/world.dm
	html/changelog.html
	icons/effects/96x96.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/hydroponics.dmi
	icons/obj/items.dmi
	icons/turf/areas.dmi
	icons/turf/walls.dmi
	maps/RandomZLevels/fileList.txt
	maps/RandomZLevels/spacebattle.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-07 00:23:22 +10:00
Chinsky
5f0c39f1cf Added implant removal surgery. 
If you fail the step, has small chance of activating implant.
Gives you a sound and ~15 ticks to run away like hell.

Changes I did to other parts to make this possible:
-Implants are now organ-based, not mob-based
-Part of implant working code is moved to appropriate activate() procs
 2013-01-06 11:25:53 +04:00
Chinsky
5805cf5ba1 Now it is possible to disfigure faces again, if head has more thn 40 damage. Burns work better for that. 2013-01-04 20:43:21 +04:00
cib
e0a500377c Fixes dropped cyborg limbs being human. 
Makes them cyborg parts instead.
 2012-12-19 23:30:58 +01:00
cib
2233d0dc8e Fixed a bug with EMP's and robolimbs. 
Light EMP's were much more likely to destroy robolimbs than heavy ones.
 2012-12-19 23:00:01 +01:00
Chinsky
d567d88749 Fixed issue with severed heads not being visible 2012-12-06 18:20:56 +04:00
Chinsky
0b614a488c Made bandages stop bleeding when applied, not waiting until next 20-tick organ update cycle. 2012-12-02 00:02:43 +04:00
cib
300219813d Fix for cryo stopping bleeding. 
Forgot that internal bleeding doesn't use drip()
 2012-11-23 16:04:16 +01:00
elly1989@rocketmail.com
73b54b017b Removed mob/var/UI, it now uses client.prefs.UI_style 
Removed var/constant/Pi It's already defined in setup.dm
Moved a bunch of global_lists to global_lists.dm
Fixed hair randomisation. (still bits to do)
Moved a lot of preferences_setup.dm stuff into __HELPERS/mobs.dm They'll be FAR more helpful as generic procs, rather than something tied to preferences.
Merged mob/var/nopush into status_flags with the CANPUSH flag
Merged mob/var/nodamage into status_flags with the GODMODE flag
Removed mob/var/be_syndicate and mob/var/be_random_name as they are not used.
Added /proc/ui_style2icon(ui_style) proc. It converts a string like "Midnight" into its corresponding dmi file. The code fore creating a new hud uses it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5164 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-11-22 15:22:08 +00:00
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
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
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
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
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
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
Chinsky
91b61f91e7 Readded pain and shock system. 
Tramadol and oxycodone are back too.
 2012-10-22 06:38:57 +04: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
Asanadas
f4193383c8 Compile fix 
Signed-off-by: Asanadas <asanadas@hotmail.com>
 2012-10-16 21:26:36 -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
6ca73039fb Wounds now bleed only until a certain stage. 2012-10-15 15:27:10 +02: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
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
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