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

45036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
silicons
c449bfcdf6 Merge pull request #15262 from dapnee/pubbyonceagain 
Moves Pubby Court and Adds the BEPIS to Science
 2021-10-15 00:18:19 -07:00
CitadelStationBot
6f08bc98b8 Automatic changelog generation for PR #15263 [ci skip] 2021-10-15 02:18:05 -05:00
silicons
a8c5df2b4b Merge pull request #15263 from DeltaFire15/ping-time 
Adds pinging to asay
 2021-10-15 00:18:02 -07:00
CitadelStationBot
97094619a0 Automatic changelog generation for PR #15253 [ci skip] 2021-10-15 02:17:53 -05: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
Changelogs
89fa46c116 Automatic changelog compile [ci skip] 2021-10-15 00:27:22 +00:00
Changelogs
b5e20ad231 Automatic changelog compile [ci skip] 2021-10-14 00:25:35 +00:00
Changelogs
7dd50272e2 Automatic changelog compile [ci skip] 2021-10-13 00:26:56 +00:00
CitadelStationBot
ac67c4e75c Automatic changelog generation for PR #15261 [ci skip] 2021-10-12 01:56:59 -05:00
Lin
4be484f101 Merge pull request #15261 from MrJWhit/delta 
Throwing trash in delta
 2021-10-11 23:56:57 -07:00
CitadelStationBot
812a144db2 Automatic changelog generation for PR #15260 [ci skip] 2021-10-12 01:49:58 -05:00
Lin
fcd488b522 Merge pull request #15260 from MrJWhit/boxstation-stuff 
Putting Trash and Fire to a box
 2021-10-11 23:49:55 -07: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
CitadelStationBot
789bbbdeb0 Automatic changelog generation for PR #15223 [ci skip] 2021-10-11 22:45:45 -05: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
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
silicons
f3e7929cb4 Merge pull request #15230 from Putnam3145/auxmos-update 
Updates auxmos to latest
 2021-10-11 15:50:03 -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
Changelogs
41b9ef2180 Automatic changelog compile [ci skip] 2021-10-11 00:28:25 +00:00
dapnee
24ce9d4de7 oopsy missed a brig wall near maint 
aaaa
 2021-10-10 17:42:37 -06:00
dapnee
de678585f0 Moves Pubby Court and Adds the BEPIS to Science 
Moved courtroom, it's now adjacent to security. This means the monastery power/air supply room got moved back to where it was. While moving around the courtroom, interrogation got moved slightly higher up and now sec/cap's maintenance has a supply-ish room for repairs.

Also BEPIS
 2021-10-10 17:29:14 -06:00
Timothy Teakettle
11df2bb77c fixes emps not working on lockers (#15259) 
* Update closets.dm

* Update code/game/objects/structures/crates_lockers/closets.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-10-11 00:48:00 +02:00
MrJWhit
e83f53c423 Update DeltaStation2.dmm 2021-10-10 16:25:42 -04:00
MrJWhit
58f4a0f7b9 Trash and Fire to a box 2021-10-10 16:07:55 -04:00
silicons
84c6970c27 Merge pull request #15250 from SandPoot/you-are-now-rate-limited 
You are now rate limited
 2021-10-09 22:14:45 -07: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
Lin
2085279590 Merge pull request #15252 from SandPoot/tooltip-related-fixes 
Tooltip related fixes
 2021-10-08 22:31:23 -07: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
silicons
8cec112f65 Merge pull request #15257 from DeltaFire15/undocumented-pirate-revert 
Reverts an undocumented change to pirate payoff minimum cost from the dynamic PR
 2021-10-08 20:50:48 -07:00
Changelogs
88836ea499 Automatic changelog compile [ci skip] 2021-10-09 00:25:57 +00:00
DeltaFire
c5476daeec revert 2021-10-08 23:51:34 +02:00
Hatterhat
20087a06a8 superglued stock 2021-10-08 00:15:35 -05:00
Putnam3145
3cfaad31c1 Merge pull request #15149 from keronshb/dynamicport 
(Probably ready for test merge) DYNAMIC 2021
 2021-10-07 18:14:59 -07:00
Lin
b92226be17 Merge pull request #15245 from Putnam3145/fix-ashwalkers-one-last-time 
Another lavaland breathing fix
 2021-10-07 11:44:47 -07:00
Lin
db0e331d45 Merge pull request #15225 from silicons/admin_ahelp_irc 
ahelps now go to irc regardless of admin count
 2021-10-07 11:40:33 -07:00
keronshb
5c562959a9 Allows midround budget to be spent in extended 2021-10-07 14:12:37 -04:00
SandPoot
f77ff24a6f Update tacklers.dm 2021-10-07 12:59:25 -03:00
SandPoot
3de08a74e7 Upload files 2021-10-07 12:32:20 -03:00
Cazz
9805224ede adds neo kanji language 2021-10-07 02:53:08 -05:00
Putnam3145
fedf409a5d Merge pull request #15105 from Citadel-Station-13/silicons-patch-7 
comedically controversial stunbaton """"buff""""
 2021-10-07 00:05:45 -07:00
Putnam3145
8be5dba86a Merge pull request #15127 from Citadel-Station-13/silicons-patch-14 
chaplain runspeed holy weapon will now only give a random slowdown/speedup of 6 tiles which for the most part ignores all other slowdowns/speedups, instead of randomizing between slowing to a crawl and running faster than the speed of light
 2021-10-07 00:05:24 -07:00
Putnam3145
ac84eed0d1 Merge pull request #15129 from Citadel-Station-13/silicons-patch-15 
if you recognize this is not the way to do it, don't do it (bandaid to polychromatic loadout lookup)
 2021-10-07 00:05:06 -07:00
Changelogs
6cb639638e Automatic changelog compile [ci skip] 2021-10-07 00:27:18 +00:00
SandPoot
e88368cd4c Update fail2topic.dm 2021-10-06 16:27:06 -03:00
SandPoot
39e63d5ac8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-06 14:49:27 -03:00
keronshb
5451e5d4d7 Space Dragon gust no longer hardstuns. (#15243) 
* Removes hardstun

* oops adds the disarm
 2021-10-06 17:30:13 +02:00
Chayse Ramsay
d1611ddf42 Lavaland ruin rad storm fix (#15242) 
* Lavaland rad storm fix

* whoops

* double whoops

* Update Lavaland.dmm
 2021-10-06 17:28:29 +02:00