shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,445 Commits 5 Branches 0 Tags
master
Commit Graph
3014 Commits
Author SHA1 Message Date
XDTMandLinzolle 947bb8cc69 port muscled veins too why not 2019-09-22 19:59:17 -05:00
Linzolle 81bb4b4c31 fix 2019-09-22 19:20:05 -05:00
Jack EdgeandLinzolle 4b36e6263e ABDUCTOR SHIT I GUESS 2019-09-22 18:36:27 -05:00
Linzolle 4878472aa4 fixes 2019-09-22 17:39:37 -05:00
AnturKandLinzolle 12a691d950 Surgery cleanup (#40788) 
* Surgery cleanup

* Proper mobtype
 2019-09-22 12:05:26 -05:00
Ghommie 3d0cb39e91 Removes revenant blight's shabby tox damage in favor of negative mood effects, and necropolis curse if not cured. 2019-09-22 18:42:47 +02:00
Poojawa 5876a235c2 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-22 00:22:18 -05:00
FermiandFermi 97fa05f446 Merge branch 'master' into tg-Organ-port 2019-09-21 14:01:52 +01:00
FermiandFermi 3b1a36fb07 Needed. 2019-09-20 04:17:01 +01:00
FermiandFermi 74cc70ed72 Like this? 2019-09-20 03:16:26 +01:00
FermiandFermi b8190552f1 Update defines, and vars, and created new procs 2019-09-19 21:24:50 +01:00
FermiandFermi 7ef5ab0332 TO TEST - also needs #9099 merging. 2019-09-19 17:52:45 +01:00
XDTMandLinzolle 023428f6a4 port experimental dissection 2019-09-18 23:04:11 -05:00
XDTMandLinzolle 8ad11d7250 ports ligament surgeries 2019-09-18 22:55:46 -05:00
FermiandFermi 587568bf88 Merge branch 'master' into tg-Organ-port 2019-09-19 01:33:15 +01:00
FermiandFermi 107dd67cbe Well it compiles; just synthtissue and TongueLoss now. 2019-09-19 01:14:12 +01:00
FermiandFermi dfa40a4b22 tg Code complete, now to bugtest and clear compile errors. 2019-09-18 23:57:21 +01:00
FermiandFermi c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Poojawa 661c357aeb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into gen-poppers 2019-09-16 18:06:36 -05:00
Poojawa fa7bf43ce7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-16 17:44:10 -05:00
PoojawaandGitHub 6668630649 Merge branch 'master' into are-those-horns-are-are-you-just-retarded 2019-09-15 23:25:22 -05:00
Ghommie c813555697 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-09-15 04:05:14 +02:00
Poojawa 2250f0e516 Merge remote-tracking branch 'refs/remotes/origin/job-menu-improvements' into gen-poppers 2019-09-13 13:00:45 -05:00
Poojawa fa364bbad0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into gen-poppers 2019-09-13 13:00:29 -05:00
Poojawa f0afc9c490 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-09-13 12:59:15 -05:00
Poojawa 53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
Poojawa 9376bfb44d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded 2019-09-13 12:56:57 -05:00
kevinz000andGitHub 42613d1800 Merge pull request #9251 from Linzolle/chaplain-fashion-time 
Allow all chaplain gear to equip the same things in their suit storage
 2019-09-13 10:42:42 -07:00
kevinz000andGitHub 39b840b180 Merge pull request #9278 from deathride58/fuckkeydown 
[s] ports tgstation/tgstation#46425
 2019-09-12 12:10:01 -07:00
BlackMajorandGitHub 7e7527dcfe Merge pull request #9086 from Sishen1542/DYNAMIC-ENTRY 
Ports dynamic gamemode from /vg/ + also normalizes head/antag restrictions
 2019-09-12 18:37:56 +12:00
deathride58 4551b13547 [s] ports tgstation/tgstation#46425 2019-09-11 19:24:05 -04:00
Poojawa 94afbbd560 Adding Horn colors, multiple-select legs, and species squash 
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking.  Sprites tweaked on a bunch of critters. Added new wings....
 2019-09-11 17:46:17 -05:00
Ghommie cbf041663f Fixing and testing themes. 2019-09-11 23:30:04 +02:00
Linzolle 5ab224e20a tweak values 2019-09-11 11:34:27 -05:00
Linzolle daba09582a move to misc.dm 2019-09-11 10:18:10 -05:00
Poojawa 8988d1e506 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-09-11 02:41:36 -05:00
kevinz000andGitHub ff0c3ee844 Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining 
The art of drunken captaining
 2019-09-10 22:06:36 -07:00
Linzolle 64b757f404 refactor suits 2019-09-07 17:10:10 -05:00
kevinz000andGitHub 09ed526594 Merge pull request #9089 from Sishen1542/rapid-construction-dabvice 
RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier
 2019-09-07 11:35:09 -07:00
Ghommie 36ffd3d6a8 More lines. 2019-09-01 03:35:36 +02:00
Ghommie db3c36fd9a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-09-01 01:59:00 +02:00
Poojawa dca90db321 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-29 23:03:26 -05:00
nik707andGitHub bfd17d66cd Merge pull request #9074 from Citadel-Station-13/donator_grouping 
Donator grouping system
 2019-08-29 18:31:23 -05:00
Ghommie 2a7b802957 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-08-29 21:01:23 +02:00
Sishen b98a5016b3 aaaaaaaaaaaa 2019-08-29 01:56:52 -04:00
Poojawa 5b4347c5ab Initial commit. 
needs to be added alongside all med_hud_set_status and tested to even fukkin' work.
 2019-08-27 04:30:31 -05:00
kevinz000andGitHub f07cdc0665 Merge pull request #9177 from JTGSZ/fix 
Fixes gang bosses being able to be deconverted with headbeatings, Adds 1 more boss slot
 2019-08-26 19:42:15 -07:00
Sishen b093439c73 aaaaaaaa 2019-08-25 16:27:02 -04:00
Rob BaileyandLinzolle 5e94a5db80 ports #44155 from /tg/station 2019-08-24 20:21:44 -05:00
Ghommie 5d1cac62da Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-08-24 13:50:22 +02:00