c4d151ce34
you buy organ, yaya?
...
Is fresh.
2016-01-30 21:37:55 -05:00
3a39d9d99d
end conflict fixes
...
did i SERIOUSLY upload my comparison file last time? FUCK
2016-01-26 22:46:03 -05:00
b2881bdc94
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-01-26 21:17:25 -05:00
e9c2d27d09
being conflict fix(3/2)
...
I SWEAR TO FUCK I NEED TO PAY ATTENTION
2016-01-26 21:16:31 -05:00
9b5f8445f8
begin conflict fix (2/2)
2016-01-26 21:12:03 -05:00
53f410272a
home streach.
2016-01-26 20:53:13 -05:00
42d8ac68b5
xeno organ fail still...
2016-01-22 22:01:24 -05:00
f5220f7ce3
Assault Surplus Create and Knife Refactor
2016-01-22 10:04:24 -05:00
f352c290de
end conflict fix
2016-01-21 21:34:16 -05:00
95dca71432
Merge branch 'OrganRefactor' of https://github.com/Aurorablade/Paradise ; branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-01-21 21:11:26 -05:00
363da58264
being conflict fix
2016-01-21 20:50:24 -05:00
cc8f402a4d
progress
...
xeno organ abiltys not working on insert (on non xeno mob)
Limb attachment for robot parts being stupid
2016-01-21 20:42:32 -05:00
1bd3da4521
Implant Refactor Part II
2016-01-17 20:03:41 -05:00
ffea6156de
removes RNG
2016-01-17 00:37:48 -05:00
ec350a0b5c
TG Implant Refactor/Overhaul
2016-01-16 01:50:10 -05:00
51013b97c0
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-01-15 08:10:24 -05:00
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
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
2623f75e0d
progress
2016-01-06 23:43:12 -05:00
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
bd19dc6942
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-01-01 22:38:23 -05:00
a4c420ccde
Conflict fixing time
2016-01-01 22:32:13 -05:00
64fdb07847
Can actually do robot face surgery now
2015-12-31 10:47:37 -08:00
92e15c1b2a
BREAK ALL THE THINGS
2015-12-31 01:23:44 -05:00
9cb84e83ca
Clean old shit, delete old files, move files, mrowl
2015-12-27 15:58:41 -08:00
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
4e1f63da7e
wot
2015-12-25 01:05:47 -05:00
027d9660de
IT COMPILES
2015-12-24 20:26:46 -05:00
1a70e9caf5
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2015-12-24 00:17:26 -05:00
5d7aa0ae00
missed one
2015-12-24 00:14:04 -05:00
96c5a5c010
might as well fix fonglict
2015-12-23 22:18:11 -05:00
046b0b997d
almost....
2015-12-23 11:40:16 -05:00
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
56751ca394
Merge pull request #2905 from Crazylemon64/robolimb_recognition
...
Advanced structural roborepair fixes disfigured bits
2015-12-21 05:59:05 -05:00
f908f12f5b
Adds a dna adder to head code so that head removal doesn't runtime ever
2015-12-20 18:46:47 -08:00
7dc03df621
Advanced structural roborepair fixes disfigured bits
2015-12-20 02:18:23 -08:00
43dcb6d043
Death to my nasty odysseus mechud snowflake!
2015-12-20 01:46:36 -08:00
80eb828563
this shit dosen't even compile yet...
2015-12-19 22:39:47 -05:00
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
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
c590958f2d
Hud refactor
2015-12-10 01:01:54 -05:00
bdb1c34a8e
Intensive care can now rescue dethrall malpractice
2015-12-06 00:21:33 -08:00
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
cd502b6a16
surgeryize me cap'n
2015-10-14 07:05:49 -04:00
e83ebc3d52
Eyes Fixes and Chem Tweaks
2015-10-12 19:39:12 -04:00
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
8181354ffc
Merge pull request #2261 from Markolie/fixesfixesfixesfixesfixesfixes
...
Fixes
2015-10-02 15:50:23 -04:00
a93304e673
Fix IPC brain surgery
2015-10-02 20:25:09 +02:00
0ffc27eded
Fix borer surgery
2015-10-02 05:54:33 +02:00
1b10a3013c
Surgery update
2015-10-01 23:10:16 +02:00
Aurorablade