shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,050 Commits 5 Branches 0 Tags
f0d5c65ef14bf5954ea76e91da9c7d8505ef71df
Commit Graph

321 Commits

Author SHA1 Message Date
silicons
ff46bfda10 Merge pull request #13547 from zeroisthebiggay/crepe 
security fashion power crêpe but it's a sheath for your anime sword
 2020-10-11 17:33:29 -07:00
zerothebigboy
ef073167df crepe 2020-10-10 21:39:45 -04:00
DeltaFire
4146566af0 hoo boy 
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
 2020-10-06 17:34:13 +02:00
DeltaFire
79af981467 fixes some fun limb code 2020-10-03 21:51:49 +02:00
Detective Google
57132d0b32 Merge remote-tracking branch 'upstream/master' into clothing 2020-10-01 14:06:21 -05:00
Detective Google
c4480afc09 Adds a bunch of RP clothes and ports the detvendor 2020-09-30 20:50:00 -05:00
EmeraldSundisk
7f0834608e Merge pull request #65 from EmeraldSundisk/Citadel-Station-13-master 
Citadel station 13 master
 2020-09-27 10:09:12 -07:00
Mark9013100
e4f9849cc3 Adds engineering hazard jumpsuits 2020-09-25 15:40:38 -04:00
EmeraldSundisk
079d4eeb58 Merge pull request #63 from EmeraldSundisk/Citadel-Station-13-master 
ffs
 2020-09-24 19:18:50 -07:00
EmeraldSundisk
7c5de6996b cargotech wardrobe 2020-09-19 15:41:59 -07:00
YakumoChen
85f8c22da9 adds mech suits to robodrobe 2020-09-18 21:16:25 +00:00
EmeraldSundisk
281d829fe6 Revert "uh what?" 
This reverts commit 0efa9eb5e5.
 2020-09-02 14:07:59 -07:00
EmeraldSundisk
0efa9eb5e5 uh what? 2020-09-02 14:07:09 -07:00
Tupinambis
39eac62dcd moves growth pills and genital autosurgeons to the kinkmate 2020-08-29 23:35:35 -05:00
silicons
7f942abef2 Merge pull request #13239 from zeroisthebiggay/fetishglovesbelike 
zero adds black fetish gloves because hes Horny
 2020-08-23 05:08:14 -07:00
zerothebigboy
21836b4ec8 : ) 2020-08-22 18:11:03 -04:00
lolman360
308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4 
TGUI4 port
 2020-08-09 05:46:21 -07:00
silicons
3068accd2b Merge pull request #13082 from Putnam3145/anaphro 
Removed (an)aphrodisiacs.
 2020-08-09 05:39:56 -07:00
Letter N
f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00
Putnam
467f66b2a6 Removed crocin/hexacrocin. 2020-08-08 00:46:30 -07:00
Putnam
9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
Letter N
9eb7aaa2d1 fixes pumps and reverts this small vending change 2020-08-07 16:12:44 +08:00
lolman360
ea97e98b5c Update _vending.dm (#13035) 2020-08-06 18:04:03 +02:00
Letter N
333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
TrilbySpaceClone
0f29235e6a Tea Party 2020-08-04 09:15:44 -04:00
Letter N
454baea55f Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-04 09:31:34 +08:00
Letter N
a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00
Timothy Teakettle
289c186f32 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-08-02 18:11:07 +01:00
Timothy Teakettle
03d01d917f Merge branch 'master' into wounds-part-2 2020-08-02 18:10:31 +01:00
Auris456852
03cff55017 Adds roboticist cartridge to the PDA vendor. 2020-07-30 23:31:31 +03:00
Letter N
b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Letter N
782e3c2ffb copypaste phase complete, major:vendies 2020-07-30 14:17:35 +08:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Adelphon
1f508ef15d Adds Camo To AutoDrobe (fix) 
Adds syndicate Camo to Autodrobe WITHOUT the armor bonuses.
 2020-07-28 15:04:58 -04:00
zerothebigboy
6329b2a760 a 2020-07-26 23:32:36 -04:00
timothyteakettle
8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
silicons
9222933d77 Merge pull request #12816 from timothyteakettle/wound-port 
ports part 1 of tg wounds
 2020-07-23 10:25:25 -07:00
lolman360
17d1fd0692 fixes 2020-07-22 12:42:46 +10:00
silicons
744b6d6b48 Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent 
maid fetish content pr
 2020-07-21 19:20:52 -07:00
zerothebigboy
7b35c5fd9d a 2020-07-21 02:30:32 -04:00
zerothebigboy
fb35248e3b a 2020-07-21 02:24:22 -04:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
silicons
3d2995b4e8 Merge pull request #12787 from CameronWoof/advanced-sutures-and-mesh 
Ports Medicated Sutures and Advanced Regenerative Mesh from TG
 2020-07-20 17:01:32 -07:00
silicons
267186a5d3 Merge pull request #12646 from Chiirno/emi 
[READY] Alt-click cigarette pack functionality added to pill bottles.
 2020-07-20 16:15:38 -07:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
timothyteakettle
e8fade4f7f changes 2020-07-18 02:29:12 +01:00
CameronWoof
431c52b7e2 Merge remote-tracking branch 'upstream/master' into advanced-sutures-and-mesh 2020-07-17 17:22:43 -07:00
silicons
04df84d1e0 Merge pull request #12776 from timothyteakettle/snail-shells 
snail shell backpack
 2020-07-17 17:07:46 -07:00