Aurorablade
c4d151ce34
you buy organ, yaya?
...
Is fresh.
2016-01-30 21:37:55 -05:00
Aurorablade
e9c2d27d09
being conflict fix(3/2)
...
I SWEAR TO FUCK I NEED TO PAY ATTENTION
2016-01-26 21:16:31 -05:00
Aurorablade
9b5f8445f8
begin conflict fix (2/2)
2016-01-26 21:12:03 -05:00
Aurorablade
53f410272a
home streach.
2016-01-26 20:53:13 -05:00
Aurorablade
42d8ac68b5
xeno organ fail still...
2016-01-22 22:01:24 -05:00
Aurorablade
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
Aurorablade
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
Aurorablade
51013b97c0
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-01-15 08:10:24 -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
92e15c1b2a
BREAK ALL THE THINGS
2015-12-31 01:23:44 -05: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
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
Aurorablade
80eb828563
this shit dosen't even compile yet...
2015-12-19 22:39:47 -05:00
Aurorablade