cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-01 21:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,498 Commits 26 Branches 2 Tags
4ba8c19e8bd4609cd3ddab0c662da007feb560bd
Commit Graph

196 Commits

Author SHA1 Message Date
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
Aurorablade
eca3edfec3 LIMBSTUMPS 2016-02-09 18:32:40 -05:00
Aurorablade
3b90cb703a almost ready for review 2016-02-08 01:16:13 -05:00
Aurorablade
e5f5b68c92 fixed slime surgery 2016-02-07 00:54:46 -05:00
Aurorablade
e1899e4af9 almost 2016-02-06 18:42:26 -05:00
Aurorablade
12b3ccb2e2 why 2016-02-04 23:57:11 -05:00
Aurorablade
0fc841f0f9 can i sleep uyet 2016-02-03 00:40:10 -05:00
Aurorablade
6001f3d80c ayyy merge conflicts fix 2016-02-02 20:46:38 -05:00
Aurorablade
e926935703 onward to merge conflicts! 2016-02-02 02:57:39 -05:00
Aurorablade
c4d151ce34 you buy organ, yaya? 
Is fresh.
 2016-01-30 21:37:55 -05:00
Aurorablade
3a39d9d99d end conflict fixes 
did i SERIOUSLY upload my comparison file last time? FUCK
 2016-01-26 22:46:03 -05:00
Aurorablade
b2881bdc94 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-26 21:17:25 -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
Fox-McCloud
f5220f7ce3 Assault Surplus Create and Knife Refactor 2016-01-22 10:04:24 -05:00
Aurorablade
f352c290de end conflict fix 2016-01-21 21:34:16 -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
363da58264 being conflict fix 2016-01-21 20:50:24 -05:00