Commit Graph

92 Commits

Author SHA1 Message Date
Zuhayr 4b030f30cd Refactors and fixes a fair bit of organ transplanting/reattachment/gibbing code. Also fixes an issue with species HUDs. 2014-12-24 16:06:00 +10:30
Zuhayr bbfc6db0a3 Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right) 2014-12-23 17:38:05 +10:30
Zuhayr 2b525372f1 Fixes #7238 2014-12-07 11:52:29 +10:30
Zuhayr 37cb78eefa Fixes #6613 and #6492 2014-10-08 23:10:12 +10:30
Zuhayr 96e57fc091 Bunch of minor fixes for xenomorphs and borer husks. 2014-10-07 08:54:05 +10:30
Zuhayr b4646b65e8 Fixed up organ transplant rejection, added cortical stacks, changed vox over to use organ stacks. 2014-09-30 14:09:41 +09:30
Zuhayr 223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
Zuhayr 9fcde12b4f Organ rewrite mapclean attempt. 2014-09-29 06:18:58 +09:30
Mloc-Argent 712e209ab6 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
2014-09-10 22:14:37 +01:00
Whitellama f5c9586153 Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer. 2014-08-31 02:12:04 -07:00
Zuhayr cf68ad7c87 Master to dev merge. 2014-08-27 20:24:07 +09:30
Kelenius a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
LightningIron 7de4825a87 Changes some messages to make more sense 2014-08-24 14:09:39 -05:00
Zuhayr b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
mwerezak 5b341bd810 IB initial damage now depends on damage taken
Also, autohealing IBs no longer stop bleeding, but do stop worsening.
2014-08-16 22:00:55 -04:00
Hubblenaut 1602cb883c Surgical tools that are nowhere near the patient don't cause a fail step 2014-08-17 02:34:25 +02:00
Hubblenaut cbb0a3c0b7 Fixes a surgery oversight regarding text coloring 2014-08-17 02:21:32 +02:00
Zuhayr f4ff51f146 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:32:00 +09:30
Zuhayr f795712a95 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2014-07-16 19:30:41 +09:30
Zuhayr 16c1494d7f Merge pull request #5613 from comma/master
Fixes #5563
2014-07-14 15:49:19 +09:30
Chinsky bb6eedf193 Fixes #5563 2014-07-14 08:28:14 +04:00
Kelenius aad89409de Slime update 2014-07-13 17:37:30 +04:00
mwerezak c0487b9c90 Fixes human internal organs list 2014-07-12 16:15:37 -04:00
mwerezak aeb587f90b Allows necrosis to be fixed with peridaxon and surgery 2014-07-06 13:02:58 -04:00
Mloc-Argent dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm
2014-06-20 22:02:40 +01:00
Hubblenaut 8a4739197e Merge branch 'backup' into medical 2014-06-19 15:36:28 +02:00
Hubblenaut 5e8a82bb0a Fixes text color in advanced trauma kit surgery step 2014-06-18 23:11:01 +02:00
Zuhayr 342bee81d4 Merge pull request #5284 from boopcat/happydrones
more fixes!
2014-06-18 08:58:00 +09:30
Boop c7d745e9c1 fixed some weird slime runtime that's been around forever apparently 2014-06-17 23:30:25 +01:00
mwerezak 1b33ca943d Separates the sharp flag into edge and sharp
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.
2014-06-15 20:25:39 -04:00
Chinsky 0e08c90571 Merge branch 'dev-freeze' into dev
Conflicts:
	maps/tgstation2.dmm
2014-03-10 19:05:24 +04:00
Ccomp5950 084c0754ad Code effeciency project: HUD items rewrite
Before: Every tick each HUD item would recalculate and redo images for every mob in view. For items like the secHUD where we're transversing implants and the various records this gets very expensive.

After: Mobs use their hud_list variable to store varius huditem images, when conditions change for those specific huditem images it updates the specific ones on demand. As a backup every 30 ticks or so the mob will update all of their hud_list.

Also: moved proc/RoundHealth() from 2 seperate locations into __HELPERS/mobs.dm
2014-03-09 10:25:36 -05:00
Ccomp5950 63e0c5b980 Merge pull request #4539 from yashaldie/master
Fix for slime surgery runtime & o2 lockers bug
2014-03-09 01:39:30 -06:00
yashaldie 421b1ea6ef Fixes for slime surgery runtime
don't know why the slime is coming though even though the target is supposed to be human...
2014-03-07 04:56:49 -05:00
yashaldie 69dfb92719 Fixes for slime surgery runtime
don't know why this works but it does and doesn't break other surgeries from what i can tell
2014-03-07 04:55:23 -05:00
Ccomp5950 c066232ab3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-03-04 18:29:03 -06:00
Chinsky 98b45e52ac Merge pull request #4518 from yashaldie/master
fixes IPC brain surgery
2014-03-04 18:18:33 +04:00
yashaldie 61a4e37466 fixes IPC brain surgery
could not start the brain surgery on IPCs this should fix it
2014-03-03 01:18:31 -05:00
ZekeSulastin 2b3c2064da Initial run of surgery steps for laser scalpels 2014-02-25 15:44:01 -05:00
Segrain b7059519c2 Merge remote-tracking branch 'upstream/master' into dev 2014-02-03 04:36:03 +03:00
DJSnapshot 810de4ddaa Merge pull request #4337 from Baystation12/dev-freeze
0.1.8 Staging [Do not merge]
2014-01-31 12:40:15 -08:00
Segrain 4df59faf76 Surgery tracking. 2014-01-31 16:28:24 +03:00
Zuhayr 4a0fb22530 IPC brain surgery code. 2014-01-29 16:01:25 +10:30
Zuhayr 69d260a11d Preliminary surgery work for IS_SYNTHETIC. 2014-01-28 16:00:36 +10:30
Zuhayr d783fd5043 Manual binary merge of head icons. 2013-12-22 23:23:25 +10:30
Zuhayr b9fcd34df3 Merged config and changelog. 2013-12-22 23:11:29 +10:30
alex-gh a48100da74 Reattaching a mindless head no longer results in a runtime error 2013-12-21 22:50:13 +01:00
Zuhayr 822b572962 Plopped the borer out of the skull when the brain is removed. 2013-12-18 13:50:11 +10:30
Mloc 503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm
2013-11-24 23:37:09 +00:00
Nanai 5cce782c34 Tool definition fix.
Properly accounted for bruisepacks vs poultices under Chinsky's PR.
2013-11-15 19:26:28 -05:00