Commit Graph

216 Commits

Author SHA1 Message Date
Aurorablade
2eaff84f42 mogjtbosdopm ues 2016-03-13 08:08:15 -04:00
Aurorablade
a653dfd69d god its late 2016-03-12 00:49:36 -05:00
Fox McCloud
b97237b97f Merge pull request #3834 from Aurorablade/SLINGTHRALL
EMERGENCY FIX:SHADOWLING DEHTRALLING
2016-03-11 00:24:50 -05:00
Fox McCloud
9ac4b13f4f Merge pull request #3830 from Aurorablade/specialeyes
MAH BRAND
2016-03-11 00:15:59 -05:00
Aurorablade
610e8ad190 i canspull good 2016-03-11 00:09:23 -05:00
Aurorablade
29c460d64b ARGH 2016-03-10 23:41:18 -05:00
Aurorablade
dcbe168d16 still no. 2016-03-10 22:58:27 -05:00
Aurorablade
0d2640b20e no 2016-03-10 21:48:49 -05:00
Aurorablade
bc1c680352 eyethings 2016-03-10 20:10:09 -05:00
Aurorablade
d8e8e751de made it so you can end cavity surgery
without having to check or implant something
2016-03-09 21:35:38 -05:00
Aurorablade
e4d9bee2b8 moar fixes 2016-03-09 18:06:08 -05:00
Fox McCloud
10fc58fe50 Merge pull request #3487 from Crazylemon64/slime_fancy_stuff
Fancy Slime People features
2016-03-08 20:18:51 -05:00
Crazylemon64
bfca35a213 Lack of encasement no longer leaves organs vulnerable 2016-03-08 17:11:33 -08:00
Crazylemon64
bdf4b05e16 Switches to a functional #undef statement 2016-03-08 17:05:14 -08:00
Crazylemon64
6c7447c127 Makes the namespacing less ridiculous 2016-03-08 17:00:14 -08:00
Crazylemon64
4f29b1b3ea Namespaced the things and undefined them when done 2016-03-08 16:56:09 -08:00
Aurorablade
7ccad08ee2 removes a palsma thing 2016-03-08 06:26:37 -05:00
Aurorablade
2da40e8ad0 Xeno issue fix. 2016-03-07 20:24:45 -05:00
Crazylemon64
309d9fc9e6 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into slime_fancy_stuff 2016-03-05 02:55:00 -08:00
Fox-McCloud
4316775c1a Surgery Tweaks 2016-03-04 21:47:41 -05:00
Aurorablade
fe3eb50b5e I'M GOING TO OPERATE
OPERATE!
2016-02-29 21:23:25 -05:00
Aurorablade
ac02c8a57d the honk strikes back 2016-02-29 12:00:57 -05:00
Aurorablade
960e5526ad the honkening 2016-02-29 07:09:58 -05:00
Aurorablade
60baa8cdeb futher removes the removed things so we can remove while we remove..
then remove the removes so we can remove
2016-02-27 23:22:29 -05:00
Aurorablade
378c5d03bc removes the removed so we can remove while we remove 2016-02-27 22:51:40 -05:00
Aurorablade
879672466a comment not commenting 2016-02-26 19:17:19 -05:00
Aurorablade
204d8bdb75 Return of the honk 2016-02-26 06:04:09 -05:00
Aurorablade
9fea6b72b8 fixes
honk tumor goes out with a honk, ipc death shinnigans are also on live,
and the xeno organ snowflakle can be fixed later.
2016-02-25 23:25:12 -05:00
Aurorablade
5f98feb0bc meanwhile as i driver tiger INSANE 2016-02-25 16:17:39 -05:00
Aurorablade
71ebef0338 honkkk 2016-02-24 20:39:29 -05:00
Aurorablade
96d713fb45 moved up borer code to another surgery 2016-02-24 08:01:44 -05:00
Aurorablade
c65b411e63 honk
i swear i am getting that adminbus organ to work eventually
2016-02-24 02:54:49 -05:00
Aurorablade
c8aa3083aa fixed
you can now rip an implant out of someones chest...
2016-02-24 01:31:58 -05:00
Aurorablade
bbac4006b5 fixc all the things. 2016-02-23 02:48:13 -05:00
Aurorablade
64d8354ec5 ding 2016-02-22 23:38:45 -05:00
Aurorablade
d861d86edd halp
open handed cavity item removal not working, help_shake_act seems to be
taking priotity, debrained sprite not appearing right on brain removal
2016-02-21 23:55:47 -05:00
Aurorablade
1b4fe03ef7 ....NOTHING TO SEE HERE 2016-02-19 23:10:59 -05:00
Aurorablade
07381e800d just a jump to the left... 2016-02-19 21:49:47 -05:00
Aurorablade
7d612b0e40 jobs done
more werk?
2016-02-19 09:24:04 -05:00
Aurorablade
3c952cc191 MERGE CONFLICT TIME
FOOOOOOOOOOXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
2016-02-18 18:42:26 -05:00
Aurorablade
29293dde10 look ma no brain 2016-02-17 22:03:02 -05:00
Crazylemon64
e725613726 Fixes organ DNA and transfer 2016-02-15 18:18:24 -08:00
Aurorablade
d81fbaf49c riohgeroi 2016-02-15 14:40:13 -05:00
Aurorablade
08d7976f00 AAHHHHHHHHHHHHHHHHHH 2016-02-14 22:06:50 -05:00
Aurorablade
d532473e89 gibs rustled, limbs logged 2016-02-14 00:00:38 -05:00
Aurorablade
7cb4534227 Dionas have a liver 2016-02-13 00:18:16 -05:00
Aurorablade
c5011003bd its done
Review it, test iit locally. going to bed now, long shift at work
tomarrow.
2016-02-12 03:04:24 -05:00
Aurorablade
b42d865c83 almost ready for review 2016-02-11 23:21:13 -05:00
Aurorablade
545d3abf19 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-11 18:03:09 -05:00
Aurorablade
5e8fa9de84 commiting before fixing merge conflicts
and stumps cuase i think i got a fix from of all places bay
2016-02-11 14:36:16 -05:00