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

29637 Commits

Author SHA1 Message Date
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
keronshb 1143e950af Fixes the mech errors 2021-10-16 11:11:59 -04:00
keronshb 9f13c7d8f3 Last roundup of fixes 2021-10-16 10:45:44 -04:00
Hatterhat f1d5db7983 lol. lmao 2021-10-16 05:02:04 -05:00
Hatterhat 7e7a5af53a brought to you by neilcic - Floor Corn 2021-10-16 05:00:15 -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 df0e95885e Minor fixes 2021-10-16 01:43:42 -04:00
keronshb 3cfea7eb92 Ball2021 2021-10-16 00:02:05 -04:00
keronshb daeaacd81c Removes Dynamic's ability to hijack loneop 2021-10-15 22:04:01 -04:00
Putnam3145 14dee78daf add extended toggle to dynamic panel 2021-10-15 17:49:20 -07:00
keronshb 46e5372f10 No anthro icons 2021-10-15 19:57:11 -04:00
keronshb 6b23d177c8 Merge remote-tracking branch 'upstream/master' 2021-10-15 19:25:41 -04:00
keronshb 95bb14bb67 Adds the missing hats, missing wings, and clothes to vendor. 2021-10-15 16:59:16 -04:00
keronshb 1cd2c59776 Merge branch 'master' into familyport 2021-10-15 14:43:53 -04:00
keronshb b9923de4e4 Disables the Antag UI panel for non families 2021-10-15 14:24:00 -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 c93fd1b486 Merge pull request #15267 from SandPoot/okay-cool-dynamic,-please-do-not-shove-it-down-my-throat 
Removes hardcoded dynamic
 2021-10-15 00:19:06 -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
keronshb 1427157df3 Fixes space cops and adds config for dynamic 2021-10-15 00:12:46 -04:00
keronshb aaa3fa277e Adds hear_1, cells work. 2021-10-14 23:46:43 -04:00
silicons d0eade8fe1 fix 2021-10-14 19:20:32 -07:00
keronshb 29a01f2d05 Antag Info and fixing the handshake finally 2021-10-14 20:43:41 -04:00
keronshb 8cb16aa0f3 Fixes item transfers 2021-10-14 17:26:17 -04:00
keronshb 13140f9bb9 Somewhat fixed huds and stuff, not 100% 2021-10-14 16:36:18 -04:00
keronshb bf7cd77096 Fixes a few things 2021-10-13 23:25:01 -04:00
keronshb 6331ced3e5 The rest of the offering stuff 2021-10-13 22:13:33 -04:00
SandPoot bdd0cee2eb Update ticker.dm 
shhhh
 2021-10-13 19:12:23 -03: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
SandPoot 39a7449625 Update ticker.dm 2021-10-13 16:57:00 -03:00
SandPoot 4d7e1b32db Update ticker.dm 2021-10-13 16:49:44 -03:00
WanderingFox95 6763324506 Fixes the BDM's proc loop (Ported from TG) 2021-10-13 21:47:24 +02:00
SandPoot 5153dba0f2 Upload files 2021-10-13 15:11:25 -03:00
SandPoot 608b6fbb1b Upload files 2021-10-12 22:17:43 -03:00
keronshb e07d39bb8b Fix atom hud 2021-10-12 17:27:22 -04:00
keronshb e2ab532de2 Removes old gangs, families is almost ready 2021-10-12 16:34:27 -04:00
keronshb bd7a2b6a2a Lets families compile 2021-10-12 16:12:38 -04:00
keronshb d88933b492 Families wanted stars now only show up when you are involved in it, and announcements for wanted level changes (#50283) 
* Wanted level stuff

* fuck

* Update code/game/gamemodes/gang/gang.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/_onclick/hud/families.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/game/gamemodes/gang/gang.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/modules/antagonists/gang/gang.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/modules/antagonists/ert/ert.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>
 2021-10-12 14:03:33 -04:00
keronshb 41013ec815 Part 2 - Missing stuff from original families port 2021-10-12 12:07:02 -04: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
keronshb 0bae06adcd Original Port 2021-10-11 22:00:54 -04: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