shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,445 Commits 5 Branches 0 Tags
master
Commit Graph

1782 Commits

Author SHA1 Message Date
keronshb 1427157df3 Fixes space cops and adds config for dynamic 2021-10-15 00:12:46 -04:00
keronshb 29a01f2d05 Antag Info and fixing the handshake finally 2021-10-14 20:43:41 -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
keronshb 0bae06adcd Original Port 2021-10-11 22:00:54 -04:00
SandPoot 437b3105d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-08 21:05:41 -03:00
Putnam3145 de51455fac Dynamic extended rewrite: some antags 2021-10-07 20:50:45 -07:00
keronshb 5c562959a9 Allows midround budget to be spent in extended 2021-10-07 14:12:37 -04:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
keronshb 4e91dde6b0 Timer fix and dead list removal 2021-09-30 14:50:04 -04:00
keronshb 5868c90fe8 Wizard fixes 2021-09-27 22:28:44 -04:00
keronshb eb548eb9b3 Fixes antag prefs breaking 2021-09-27 20:03:42 -04:00
keronshb 5da5ac396c Head blacklist for antag 2021-09-26 14:29:46 -04:00
keronshb af2777a604 Citadel weight adjustments and config 2021-09-25 17:56:15 -04:00
keronshb fb5653e12c Voting fix 2021-09-25 12:59:18 -04:00
keronshb a6bfff92cc Fixes pirates, re adds extended, re adds voting 2021-09-24 19:40:56 -04:00
keronshb cbe221e18f Adds more blackbox stuff 2021-09-23 19:57:51 -04:00
keronshb c9697f4bbf Fixes dynamic 2021-09-23 19:38:15 -04:00
keronshb c8814e8cc8 Merge remote-tracking branch 'upstream/master' into dynamicport 2021-09-19 18:09:18 -04:00
keronshb 13323d2597 Merge branch 'master' into dynamicport 2021-09-19 17:59:09 -04:00
keronshb 0b5a7c9759 OOPS FORGOT PIRATES and some blacklists 2021-09-19 17:56:26 -04:00
zerothebigboy c6ce359cda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	tgstation.dme
 2021-09-19 15:23:52 -04:00
keronshb 6cc4e35b44 Mob lists 2021-09-19 13:28:41 -04:00
keronshb 408517fb1d SHOULD? FIX? 2021-09-16 20:53:46 -04:00
keronshb 372725c1f4 Fixes everything???? 2021-09-16 15:40:21 -04:00
keronshb 095a803cc5 linter fixes 2021-09-16 13:51:39 -04:00
keronshb 792dc073b3 Final fixes? 2021-09-16 13:28:34 -04:00
keronshb c798eb1ef0 I'm overwhelmed 2021-09-15 19:13:08 -04:00
keronshb f2b7dba990 More fixes? 2021-09-15 18:52:24 -04:00
keronshb 5bed02e36e More fixes, I don't know 2021-09-15 16:12:19 -04:00
keronshb edde5043dd More fixes, more errors 2021-09-15 15:55:59 -04:00
keronshb 4eaeccf8d8 Fixes more errors 2021-09-15 15:25:26 -04:00
keronshb bbe6f80790 Re adds the log 2021-09-14 21:55:12 -04:00
keronshb 4f5071cc87 Clockwork fix and removal of station traits 2021-09-14 21:53:08 -04:00
keronshb 7ed5f622f4 Dynamic 2021-09-14 19:33:17 -04:00
Putnam3145 cd9b5fb7d8 Makes special objective items delete on reroll 2021-09-14 14:34:41 -07:00
zerothebigboy 68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners 2021-09-10 12:12:57 -04:00
keronshb 4f54c465b2 ReebeReturns (#15056) 2021-09-09 06:17:00 +02:00
zerothebigboy ccfde52b0d code 2021-09-02 23:45:03 -04:00
zerothebigboy 30134a0d2f cool 2021-09-01 06:32:33 -04:00
zerothebigboy 06181f51ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	code/modules/ninja/suit/suit.dm
 2021-08-19 21:55:22 -04:00
Putnam3145 f3b590f5f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps 2021-06-30 02:19:02 -07:00
Putnam3145 630098c8aa that might be all 2021-06-21 20:03:27 -07:00
Putnam3145 fbbae70527 i need to go to bed and this is a LOT 2021-06-21 10:14:50 -07:00
zerothebigboy fb32aa1248 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	tgstation.dme
 2021-06-20 03:29:50 -04:00
Putnam3145 dbdc3001ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-16 23:33:14 -07:00
MrJWhit a324701730 Revert "adds cat meteors" 2021-06-13 05:25:02 -04:00