Commit Graph

1442 Commits

Author SHA1 Message Date
Aurorablade 51013b97c0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-15 08:10:24 -05:00
Aurorablade 678a2e9f4e commit so i can go bugfix and do other things
besides code in organs...tell me what i did wrong!
2016-01-09 00:05:25 -05:00
Aurorablade 87d2023af3 so you can almost perform surgery with a claymore
things needed: Addeing the sharp object used as a low success allowed
tool on the fly. Handleing advanced scalpals.
2016-01-07 23:25:06 -05:00
Aurorablade 2623f75e0d progress 2016-01-06 23:43:12 -05:00
Aurorablade 948adea83b Added Asses as an organ
...made you look...
seriously though, refined some surgery datums/steps and commiting so i
can go bugfix some stuff...and a sidequest...i need to adjust return
values.
2016-01-04 08:25:39 -05:00
Aurorablade bd19dc6942 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-01 22:38:23 -05:00
Aurorablade a4c420ccde Conflict fixing time 2016-01-01 22:32:13 -05:00
Crazylemon 64fdb07847 Can actually do robot face surgery now 2015-12-31 10:47:37 -08:00
Aurorablade 92e15c1b2a BREAK ALL THE THINGS 2015-12-31 01:23:44 -05:00
Tigercat2000 9cb84e83ca Clean old shit, delete old files, move files, mrowl 2015-12-27 15:58:41 -08:00
Aurorablade 2146cc0d3d things
and stuff...gonna need to get to those merge conflicts eventually. also
purged all mention of internal_organs by name from the face of the
earth. we have get_int_organ now...i may need to tweak shit. oh and i
broke some things...
2015-12-26 17:34:38 -05:00
Aurorablade 4e1f63da7e wot 2015-12-25 01:05:47 -05:00
Aurorablade 027d9660de IT COMPILES 2015-12-24 20:26:46 -05:00
Aurorablade 1a70e9caf5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2015-12-24 00:17:26 -05:00
Aurorablade 5d7aa0ae00 missed one 2015-12-24 00:14:04 -05:00
Aurorablade 96c5a5c010 might as well fix fonglict 2015-12-23 22:18:11 -05:00
Aurorablade 046b0b997d almost.... 2015-12-23 11:40:16 -05:00
Aurorablade 4b7253befc commit so i can swap branches...
please note, anything further on changling may invovle updates to game
mode, so another pr. and yes with the brains its jut blocked from
prepare_eat() proc
2015-12-21 23:19:27 -05:00
Fox McCloud 56751ca394 Merge pull request #2905 from Crazylemon64/robolimb_recognition
Advanced structural roborepair fixes disfigured bits
2015-12-21 05:59:05 -05:00
Crazylemon f908f12f5b Adds a dna adder to head code so that head removal doesn't runtime ever 2015-12-20 18:46:47 -08:00
Crazylemon 7dc03df621 Advanced structural roborepair fixes disfigured bits 2015-12-20 02:18:23 -08:00
Crazylemon 43dcb6d043 Death to my nasty odysseus mechud snowflake! 2015-12-20 01:46:36 -08:00
Aurorablade 80eb828563 this shit dosen't even compile yet... 2015-12-19 22:39:47 -05:00
Crazylemon64 fe606492a0 Organs are now easier to keep clean for surgery
* They initially rot slower, and won't rot if on the same tile as a freezer

* Having dirty hands when doing internal organ surgery will now contaminate
the internal organs. Wash those hands!
2015-12-18 04:51:04 -08:00
Crazylemon64 26545e6ba1 Fixed up organ surgery so it'd reflect organs properly
This will work in spite of the states, so that sticking a human head on an
IPC will still let you remove the brain from that useless head, without
giving the brain any silly names
2015-12-16 23:01:28 -08:00
Aurorablade c590958f2d Hud refactor 2015-12-10 01:01:54 -05:00
Crazylemon64 bdb1c34a8e Intensive care can now rescue dethrall malpractice 2015-12-06 00:21:33 -08:00
Crazylemon64 9241442cc6 Some fixes to robotics surgery
Internal organ fixing surgery will now work correctly on robotic organs,
using nanopaste in place of trauma kits

Defibs also don't need the body to be past the point of deadness to work

Kitchen utensils should now properly work as surgery tools where given in
code

IPC thralls can now be dethralled by performing the surgery on where their
brain is, in this case their chest. This will also work for any species
that has a brain anywhere else in their body.
2015-12-05 01:35:59 -08:00
Fox-McCloud cd502b6a16 surgeryize me cap'n 2015-10-14 07:05:49 -04:00
Fox-McCloud e83ebc3d52 Eyes Fixes and Chem Tweaks 2015-10-12 19:39:12 -04:00
Crazylemon d4a37d2020 Reinserted positronic brains are now properly robotic
Also tweaks the error message for operating on a meaty body
2015-10-02 15:24:17 -07:00
TheDZD 8181354ffc Merge pull request #2261 from Markolie/fixesfixesfixesfixesfixesfixes
Fixes
2015-10-02 15:50:23 -04:00
Markolie a93304e673 Fix IPC brain surgery 2015-10-02 20:25:09 +02:00
Markolie 0ffc27eded Fix borer surgery 2015-10-02 05:54:33 +02:00
Markolie 1b10a3013c Surgery update 2015-10-01 23:10:16 +02:00
Markolie d18b18b5b4 Syndicate borg update, add medical syndicate borg, energy sword refactor 2015-10-01 04:21:24 +02:00
Fox-McCloud fde0490323 Laser Scalpel Damage Nerf 2015-09-23 07:45:13 -04:00
Fox-McCloud 128ad8225b Clans Up Surgery Files 2015-09-21 07:17:23 -04:00
Tigercat2000 be92665871 Replace magic intent words with defines, grab fixes
This commit does the following:
 - Replaces all instances of magic intent words, like "harm" and
 "help" with defines, I_HELP, I_DISARM, I_GRAB, I_HARM

 - Fixes a few manual grab instances left over in attack_alien, they
 will now used grabbedby()
2015-09-07 11:51:00 -07:00
Fox-McCloud a019934e9e Pass I 2015-09-04 05:18:48 -04:00
Markolie 8bede1db99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace
Conflicts:
	code/modules/mob/living/simple_animal/friendly/fox.dm
	code/modules/organs/organ_alien.dm
2015-08-18 18:38:59 +02:00
Markolie 5eee617063 Consolidate ?/FLW links under key_name_admin 2015-08-17 00:13:53 +02:00
Markolie a397c730b5 Admin jump overhaul, add watchlist functionality, other admin updates 2015-08-16 23:28:02 +02:00
Markolie d607739078 Final IPC fixes (hopefully) 2015-08-16 03:43:20 +02:00
Markolie 4a14a97b3b IPC overhaul part deux 2015-08-16 02:34:52 +02:00
Markolie e6408b96c2 IPC overhaul 2015-08-15 23:52:26 +02:00
Fox-McCloud 1e0ce54165 more fixes and tweaks 2015-08-05 23:00:21 -04:00
Fox-McCloud 5ae43f0875 Shadowling Surgery and Fixes 2015-08-05 21:52:17 -04:00
Fox-McCloud 0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
Fox-McCloud eb64e3ea05 Icon and Sound Cleanup 2015-06-06 09:38:10 -04:00