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

710 Commits

Author SHA1 Message Date
DeltaFire b3f0a74ff9 delay returns 2021-12-14 18:40:33 +01:00
DeltaFire 6aa906395c not a gaius reference 
hhhh let me just replace all the ex_acts missing some args and adjust them
 2021-11-14 21:34:59 +01:00
Letter N bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot 13d7a166fe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-27 13:54:49 -03:00
Lin 5066e34736 Merge pull request #15258 from keronshb/pirate10k 
Raises Pirate pay rate back to 10000 again.
 2021-10-24 15:09:03 -07:00
keronshb daeaacd81c Removes Dynamic's ability to hijack loneop 2021-10-15 22:04:01 -04:00
SandPoot 829ca8b9a7 Merge branch 'master' into tgui-alerts-and-what-not 2021-10-11 20:41:56 -03:00
keronshb 1c754b814e Pirates pay raise documented 2021-10-09 00:47:16 -04:00
keronshb fce4eb0476 Merge branch 'dynamicport' 2021-10-09 00:28:30 -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
DeltaFire c5476daeec revert 2021-10-08 23:51:34 +02: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
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 deaab16e55 Ninja hijack in dynamic 2021-09-30 23:49:51 -04:00
keronshb 3bda0e9015 Pirate fix 2021-09-26 21:00:48 -04:00
keronshb a6bfff92cc Fixes pirates, re adds extended, re adds voting 2021-09-24 19:40:56 -04:00
KrabSpider 11a414d8c8 blacklists cryogenics from anomaly spawns 
adds cryogenics to the anomaly blacklist.
 2021-09-20 16:41:40 -04: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 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
silicons c4386c0a4f Merge pull request #15175 from buffyuwu/hallucination 
meme pr that adds a hallunciation sound
 2021-09-19 11:11:05 -07:00
buffyuwu bdf46b1d46 meme pr 2021-09-18 04:53:17 -04:00
keronshb 518c54c061 Adds the correct hijack 2021-09-16 15:52:53 -04:00
keronshb f2b7dba990 More fixes? 2021-09-15 18:52:24 -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
DeltaFire f7bcfa57ae safety 2021-09-13 23:28:02 +02:00
silicons 6de44f794e Merge pull request #15010 from Putnam3145/atmos-funnies 
Supermatter surge rework: consequential for N2, won't explode immediately for CO2
 2021-08-26 21:39:33 -07: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 22fae70132 Supermatter surge rework 2021-08-14 19:39:31 -07:00
BlueWildrose d1a1c737d4 Blacklists incapacitated mobs from being sentience event candidates 2021-08-13 11:29:54 -07:00
Putnam3145 39679ea239 explicit "no rads" sentence 2021-08-05 06:19:29 -07:00
Putnam3145 571c017eec Also makes the end stuff only show if announced 2021-08-05 06:18:33 -07:00
Putnam3145 f821315263 Halves probability on supernova rads 2021-08-05 06:14:38 -07:00
WanderingFox95 f8f6dcae14 Add files via upload 2021-07-03 22:17:06 +02: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
silicons 5204f5a6d9 Merge pull request #13991 from Putnam3145/auxtools-atmos 
Replaces extools with auxtools; atmos overhaul
 2021-06-27 11:01:32 -07:00
Putnam3145 0f229495d0 aaand i forgot some /proc/s 2021-06-21 20:32:55 -07:00
Putnam3145 fbbae70527 i need to go to bed and this is a LOT 2021-06-21 10:14:50 -07:00
WanderingFox95 49f4ca0d17 Added an announcement. 
Not sure on the exact tone of it,
but this will do for now.
 2021-06-21 16:24:59 +02:00
Putnam3145 f77495f45d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-21 02:19:51 -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
silicons 3c7786dafd Merge pull request #14734 from keronshb/SpaceDragon 
(READY) Ports Space Dragon Midround Event.
 2021-06-18 20:03:43 -07: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
silicons 09d61c3bec Merge pull request #14776 from WanderingFox95/WanderingFox95-CatSurgeon 
New Challenger: The Cat Surgeon has appeared! (Ready!)
 2021-06-09 11:29:24 -07:00