shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,765 Commits 5 Branches 0 Tags
a6bfff92ccbfe04b686fa11f7a02010c566e79fa
Commit Graph

1714 Commits

Author SHA1 Message Date
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
Putnam 833d34ba8e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-11 16:28:12 -07:00
zerothebigboy 1a90c96e4b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/feet.dmi
#	icons/mob/clothing/feet_digi.dmi
#	icons/mob/clothing/head.dmi
#	icons/mob/clothing/mask.dmi
#	icons/mob/clothing/mask_muzzled.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/masks.dmi
#	icons/obj/items_and_weapons.dmi
 2021-06-09 17:40:28 -04:00
Putnam 86177c51c4 auxgm part 1 
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
 2021-06-08 09:54:28 -07:00
DrPainis 2eeb6ede1e lowers cat meteor threat and makes them use the cat meteor sprite 2021-05-27 12:20:54 -04:00
DrPainis d199f0585a adds cat meteors 
because funny
 2021-05-27 00:23:24 -04:00
zerothebigboy 359c778955 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	code/modules/ninja/suit/ninjaDrainAct.dm
 2021-05-02 22:47:39 -04:00
Putnam 4811216f07 Activity tracking; traitor class tweaks 2021-04-13 06:42:32 -07:00
silicons cbd7e0de6a Merge pull request #14418 from LetterN/perlin-genny 
Updates openspace & enables perlin generation on alvaland & icebox/snaxi
 2021-04-06 04:10:00 -06:00
Putnam3145 e509f1956d Removed cloning destroy; removed commented-out objs (#14539) 2021-04-02 19:48:55 +02:00
LetterN f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
Putnam 899b94f0f3 Made threat a subsystem instead of dynamic-attached. 2021-03-24 23:44:37 -07:00
LetterN e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-24 21:55:47 +08:00
silicons d9a2316825 fix 2021-03-20 12:13:28 -07:00
LetterN 292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
zerothebigboy 8456b3f709 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/head.dmi
#	icons/mob/clothing/mask.dmi
#	icons/mob/clothing/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/masks.dmi
#	icons/obj/clothing/suits.dmi
 2021-03-19 14:30:05 -04:00
Putnam f3ea1b1a0c Relabeled to "Antag"; unambiguized in 2021-03-16 22:53:55 -07:00
Putnam d990328e29 Added a "no antags please" button 2021-03-16 22:37:39 -07:00
zerothebigboy 01d92230a3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/mask.dmi
 2021-03-16 19:19:12 -04:00