shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,198 Commits 5 Branches 0 Tags
ebf652f736c302c4a7e7aaea8b0912fc30bb0fc0
Commit Graph

711 Commits

Author SHA1 Message Date
ItzGabby
68bf156091 Merge branch 'master' into bark-box 2021-03-19 02:48:31 -04:00
ItzGabby
4a49f6eebe barked on 2021-03-19 01:38:17 -04:00
DeltaFire
45c3f2b222 Merge pull request #14406 from Hatterhat/hypoprints 
a PR about empty hypospray kits, vial printing, along with a thing about quantum electromag
 2021-03-17 17:01:47 +01:00
Hatterhat
d473b271cb uh oh! it's another stupid fucking hatter pr! 2021-03-10 15:06:39 -06:00
Letter N
22b33d1a6e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-07 13:04:36 +08:00
dzahlus
f0a34723d7 tase lase 2021-03-01 23:58:29 +01:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
Letter N
037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot
2e29f30fdf Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing 2021-02-18 15:04:22 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Letter N
8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
SmArtKar
2135a391dc More cards? More cards! 2021-02-04 19:03:03 +03:00
SmArtKar
2cd339f776 Adds Card Ops bundle 2021-02-04 18:57:00 +03:00
silicons
fa587e3d1a Merge pull request #14100 from Hatterhat/sheath-exp 
twinsheath additions
 2021-01-20 15:20:45 -07:00
Letter N
021b28a2b7 cleanup 
shitcode - b - gone
 2021-01-20 11:08:21 +08:00
Hatterhat
fccf24ac17 sheef 2021-01-19 16:54:49 -06:00
DeltaFire
3f736aaa36 Merge pull request #13834 from zeroisthebiggay/pogbox 
ports the traitor assistant POGBOX that scales damage with tc from /TG/
 2021-01-06 19:29:17 +01:00
zeroisthebiggay
b20607cb1a Update toolbox.dm 2021-01-03 20:18:55 -05:00
necromanceranne
0aa5338f9b Adds wakibokken, puts bokken crafting into the craft menu, makes proper bokken a little harder to make but obviously an upgrade, makes crafted katanas and bokken have actual belt overlays 2021-01-01 05:42:28 +11:00
zeroisthebiggay
3f36b95f92 a 
a
 2020-12-23 09:42:10 -05:00
zerothebigboy
dcecd6f03a pogbox 2020-12-21 18:28:52 -05:00
zerothebigboy
cca8dc3a36 pogbox 2020-12-21 18:25:33 -05:00
DeltaFire
8414db5add Merge pull request #13814 from Xantholne/TwinSwordSheath 
Fixes twin sword sheaths icon/item state from being blank sprites
 2020-12-21 02:20:32 +01:00
Xantholne
1c968e6ebe period equals 2020-12-20 16:00:18 -07:00
silicons
34f6697e81 Merge pull request #13796 from keronshb/fixedscarpchanges 
Scarp Changes and Bundle
 2020-12-20 09:23:20 -07:00
Xantholne
a5c14b90c5 Adds missing sheathing sounds 2020-12-18 22:56:30 -07:00
Xantholne
d60d72c7b7 Fixes twin belts 
gives item state and icon state to be functional
 2020-12-18 22:03:24 -07:00
keronshb
3d7c896100 Scarp Changes and Bundle 
This should really fix it now.
 2020-12-15 20:10:21 -05:00
MrJWhit
f5b99b83f8 Fully functional 2020-12-13 02:29:29 -05:00
shellspeed1
3735efbfca Ports construction bags 2020-11-29 18:29:03 -08:00
Artur
503d0156c6 Does the thing 2020-11-08 23:24:58 +02:00
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
DeltaFire
a5fce4b6ed Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2 2020-10-11 15:39:41 +02:00
zerothebigboy
a8315a69e2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into crepe 
# Conflicts:
#	icons/mob/clothing/belt.dmi
#	icons/obj/clothing/belts.dmi
 2020-10-11 01:19:18 -04:00
zerothebigboy
ef073167df crepe 2020-10-10 21:39:45 -04:00
The0bserver
e40e4a79d3 Allows plantbags to hold plantdisks 2020-10-10 08:58:54 -04:00
The0bserver
98f398338a belt fix and icons 2020-10-09 02:34:42 -04:00
The0bserver
0d1d94fd06 belt 2020-10-09 01:17:46 -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
lolman360
0ff85deddf Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-08-25 01:25:34 +10:00
lolman360
bc14155632 Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-08-23 17:01:45 +10:00
lolman360
1deafc7103 its asking me to commit hold on 2020-08-23 17:01:32 +10:00
lolman360
2a3ada511e It's all codersprites? 
Always has been.
 2020-08-23 16:51:55 +10:00
Hatterhat
8645a2954f tackle hando 2020-08-22 16:13:41 -05:00
silicons
120bcfc00c Merge pull request #13178 from lolman360/plumb 
[READY] ports plumbing (no more waiting for tgui4)
 2020-08-20 21:32:26 -07:00
lolman360
e00c383b1a Update belt.dm 2020-08-18 20:19:54 +10:00
silicons
a900c07846 Merge branch '13163' 2020-08-16 18:51:24 -07:00
silicons
01dd2f389b Merge branch 'pr-13067' 2020-08-16 18:38:13 -07:00