shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,142 Commits 5 Branches 0 Tags
13d7a166feb6db38ab441b431ebd89368b667c2e
Commit Graph

19822 Commits

Author SHA1 Message Date
SandPoot
13d7a166fe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-27 13:54:49 -03:00
SandPoot
67c6cc3fc0 tiny fix 2021-10-27 13:48:34 -03:00
silicons
679189cb3d Merge pull request #15277 from Hatterhat/autoloom 
i've been sitting on this a while but here have the AUTOLOOM
 2021-10-27 05:13:40 -07:00
silicons
77116e110c Merge pull request #15293 from Higgin/let-the-bodies-hit-the-floor 
Makes bodies laying on the ground also act as obstacles to crawling.
 2021-10-27 05:12:16 -07:00
silicons
d6d037de43 Merge pull request #15232 from Putnam3145/minesweeper-removal 
Removes minesweeper
 2021-10-27 05:11:48 -07:00
WanderingFox95
4b13d1772c [Ready] Bone Anvil and processable Bone ingots (#15290) 
* Adding all the extra stuff

* whoops, slipped my last fix in here.

* bone balance

* 6 Goliaths + 3 Watchers + 1 Legion

* bumps the damage modifier down to 1.05

* More Bones.

* Undoes the undoing of the other fix PR

Co-authored-by: Emily <null>
 2021-10-25 18:11:54 +02:00
deathride58
34e6187add Merge pull request #15148 from Citadel-Station-13/silicons-patch-1 
disables prisoners
 2021-10-24 22:02:27 -04:00
Lin
e1aeaa76fd Merge pull request #15280 from Putnam3145/siphoning-vents 
Allows setting vents to siphon
 2021-10-24 15:09:35 -07:00
Lin
5066e34736 Merge pull request #15258 from keronshb/pirate10k 
Raises Pirate pay rate back to 10000 again.
 2021-10-24 15:09:03 -07:00
raspy
921717d9cd tesla counterplay now accounts for grounding rod capacitor type (#15291) 
* tesla energy loss accounts for capacitor rating

* reverse qdel and energy loss as suggested

Co-authored-by: = <=>
 2021-10-23 03:58:39 +02:00
Letter N
5035536311 Clowncar does not ignore airlocks again (#15220) 
* no airlock tomfoolery

* Update clowncar.dm

* Update clowncar.dm

* assuming direct control

fixes inconsistant indentation.

* inverted operators

Co-authored-by: DeltaFire <andreoxgrievous@gmail.com>
 2021-10-21 21:03:59 +02:00
Lin
5e964fe98e Merge pull request #15289 from WanderingFox95/boneglaivesprite 
Bone glaive sprites didn't show up properly...
 2021-10-21 11:19:17 -07:00
Higgin
5c16f13394 Makes bodies laying on the ground also act as obstacles to crawling. 
Adds proper comments.
 2021-10-21 05:52:33 -07:00
Lin
2d439ffc71 Merge pull request #15209 from Putnam3145/more-ashwalker-woes 
More ashwalker lung adjustments
 2021-10-20 17:49:20 -07:00
Emily
57950045a7 Fixes the sprites for wielding. 2021-10-20 10:06:14 +02:00
Putnam3145
136ca1f107 Merge branch 'master' into more-ashwalker-woes 2021-10-18 04:35:57 -07:00
Putnam3145
34936ee5af Properly implements hysteresis 2021-10-18 03:44:40 -07:00
Putnam3145
b593774cc9 Merge pull request #15274 from keronshb/dynamicloneophijack 
Removes Dynamic's ability to hijack loneop
 2021-10-17 19:56:00 -07:00
Putnam3145
42da1e2079 Allows setting vents to siphon 2021-10-17 19:55:13 -07:00
SandPoot
8adf4606d7 closes #15279 2021-10-17 23:04:24 -03:00
SandPoot
45ef0fe5ca closes #15278 2021-10-17 21:40:39 -03:00
Hatterhat
9c45c41d4f ae 2021-10-16 18:27:59 -05:00
SandPoot
17986fea3f cannot escape 2021-10-16 14:24:22 -03:00
SandPoot
1561138350 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-16 14:11:00 -03:00
Hatterhat
f1d5db7983 lol. lmao 2021-10-16 05:02:04 -05:00
Lin
1f7e65ad01 Merge pull request #15271 from Citadel-Station-13/admin_tickets 
fixes "answered by <admin>" spam in irc
 2021-10-15 23:34:15 -07:00
keronshb
daeaacd81c Removes Dynamic's ability to hijack loneop 2021-10-15 22:04:01 -04:00
silicons
e6e0341cd8 Merge pull request #15268 from WanderingFox95/WanderingFox95-BDMFix 
Removes the proc loop from the BDM's AI.
 2021-10-15 00:19:26 -07:00
silicons
e99688242f Merge pull request #15266 from SandPoot/tiny-sized-fixes 
Tiny sized fixes
 2021-10-15 00:18:48 -07:00
silicons
d17419ed54 Merge pull request #15256 from keronshb/fatdart 
no idea what this thing even is but he's chuffin back a fat dart and that's all that matters
 2021-10-15 00:18:39 -07:00
silicons
a8c5df2b4b Merge pull request #15263 from DeltaFire15/ping-time 
Adds pinging to asay
 2021-10-15 00:18:02 -07:00
silicons
cca9efebd4 Merge pull request #15253 from SandPoot/tackler-gloves-no-spam-and-only-worn 
Tackler gloves only work being worn
 2021-10-15 00:17:49 -07:00
silicons
d0eade8fe1 fix 2021-10-14 19:20:32 -07:00
WanderingFox95
75fee6ec25 applies requested changes 2021-10-13 22:25:15 +02:00
WanderingFox95
afbc34eea2 Hmm 2021-10-13 22:18:07 +02:00
WanderingFox95
6763324506 Fixes the BDM's proc loop (Ported from TG) 2021-10-13 21:47:24 +02:00
SandPoot
608b6fbb1b Upload files 2021-10-12 22:17:43 -03:00
silicons
f623d6e7eb Merge pull request #15229 from Hatterhat/perhaps-i-was-a-bit-too-harsh 
vareditable clip reloading delay for shotguns
 2021-10-11 20:46:06 -07:00
silicons
91e7cb293c Merge pull request #15223 from Hatterhat/yeehaw-box 
The Yeehaw Update - makes .38 lever-actions slightly more accessible
 2021-10-11 20:45:42 -07:00
SandPoot
829ca8b9a7 Merge branch 'master' into tgui-alerts-and-what-not 2021-10-11 20:41:56 -03:00
Putnam3145
b6fdf671f1 Merge pull request #15215 from silicons/afk_tracking 
fixes afk detection
 2021-10-11 15:52:03 -07:00
Putnam3145
3209917830 Merge pull request #15173 from silicons/vpn_block 
adds PANIC_BUNKER_LIVING_VPN option (READ, THIS IS NOT A VPN BAN)
 2021-10-11 15:51:52 -07:00
Putnam3145
83ebebaa05 Merge pull request #14890 from Citadel-Station-13/silicons-patch-44 
[experimental] changes to slowdown scaling
 2021-10-11 15:51:33 -07:00
DeltaFire
5680b74294 safety 2021-10-11 20:32:00 +02:00
DeltaFire
66e81e7fda asay ping time 2021-10-11 19:52:30 +02:00
silicons
7c311f9730 Merge pull request #15251 from UncleBourbon/i-love-coding 
Adds Neo-Kanji language to roundstart language and space ninja
 2021-10-09 22:14:26 -07:00
keronshb
0e92551e51 Merge branch 'master' into pirate10k 2021-10-09 11:58:55 -04:00
Lin
2085279590 Merge pull request #15252 from SandPoot/tooltip-related-fixes 
Tooltip related fixes
 2021-10-08 22:31:23 -07:00
keronshb
1c754b814e Pirates pay raise documented 2021-10-09 00:47:16 -04:00
silicons
a7fe6f0cfd Merge pull request #15255 from Hatterhat/saiga-fix 
unsuperglues the warden's CCS stock
 2021-10-08 20:57:30 -07:00