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

2017 Commits

Author SHA1 Message Date
keronshb b9923de4e4 Disables the Antag UI panel for non families 2021-10-15 14:24:00 -04: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
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 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
keronshb fce4eb0476 Merge branch 'dynamicport' 2021-10-09 00:28:30 -04:00
silicons 5ff4a2ace5 Merge pull request #15180 from LetterN/achives- 
Achivement & Clowncar update
 2021-09-28 00:15:52 -07:00
keronshb c8814e8cc8 Merge remote-tracking branch 'upstream/master' into dynamicport 2021-09-19 18:09:18 -04:00
keronshb cd00d1589e fucking hell 2021-09-19 18:06:24 -04:00
keronshb 13323d2597 Merge branch 'master' into dynamicport 2021-09-19 17:59:09 -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
silicons c16f29ffb2 Merge pull request #15137 from DeltaFire15/clockcult-ai-conversion 
Allows clock cultists to convert carded AIs by placing their card onto a conversion sigil
 2021-09-19 11:04:50 -07:00
silicons d90483c428 Merge pull request #15119 from keronshb/slaughterbuff 
Fixes Slaughter Demon, gives it an action button, and a slight buff
 2021-09-19 11:03:18 -07:00
keronshb 6cc4e35b44 Mob lists 2021-09-19 13:28:41 -04:00
LetterN 0b7e514739 t 2021-09-19 14:05:28 +08:00
keronshb 518c54c061 Adds the correct hijack 2021-09-16 15:52:53 -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 f2b7dba990 More fixes? 2021-09-15 18:52:24 -04:00
keronshb 7ed5f622f4 Dynamic 2021-09-14 19:33:17 -04:00
DeltaFire 6664be64c7 change 2021-09-13 22:34:05 +02:00
silicons e342145663 Merge pull request #15070 from zeroisthebiggay/prisoners 
prisoners - aka ports prisoners from tg hell yeah
 2021-09-12 20:59:12 -07:00
keronshb b444afede3 ACTION BUTTON SLAM 2021-09-11 12:06:18 -04:00
Letter N de4311e4d9 shut up 2021-09-11 12:50:06 +08:00
keronshb 0233f2123f Slaughter Fix and Buff 2021-09-10 21:00:28 -04: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 d4383cb507 Mask of madness viewers 2021-09-06 22:38:56 -04:00
zerothebigboy ccfde52b0d code 2021-09-02 23:45:03 -04:00
Putnam3145 7f838ab9cd Fixes duplicate traitor listing in traitor panel 2021-08-31 18:03:52 -07:00
DeltaFire 167b9ef331 ae 2021-08-26 03:45:44 +02:00
DeltaFire 6df932c959 *laugh 2021-08-26 03:40:20 +02:00
DeltaFire f8866774aa no scattering 2021-08-26 03:30:51 +02: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
silicons 715a215cf1 Merge pull request #14992 from SandPoot/more-radial-wheels-for-your-pain 
Changelings now use a radial menu to select DNAs (tg port)
 2021-08-13 14:04:35 -07:00
silicons 51dbc8e21f Merge pull request #14685 from Arturlang/fake_blood 
Reworks blood regeneration into something a bit more tame
 2021-08-11 02:54:49 -07:00
SandPoot c453d2230d perhaps this one as well? 2021-08-09 11:31:33 -03:00
SandPoot 6c338c6479 forget it, this one works good enough already 2021-08-09 11:03:51 -03:00
SandPoot 2844c1df32 Update changeling.dm 
Web change because angry i didn't notice.
 2021-08-08 13:09:52 -03:00
SandPoot 1d0f1a56dd Upload files 2021-08-08 13:00:44 -03:00
Artur 5acd7fef2d makes salglu not deadly 2021-08-02 21:54:47 +03:00
Artur 6b5bdae184 salglu works like normal now again and adds more sanity 2021-07-29 23:55:27 +03:00
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Artur 67de120624 Replaces a few more direct blood refillers 2021-07-23 18:58:42 +03:00
Artur be1e9e4e04 deals with conflicts 2021-07-23 18:53:48 +03:00
Artur 2adfbea215 Merge remote-tracking branch 'origin/master' into fake_blood 2021-07-23 18:50:09 +03:00