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

673 Commits

Author SHA1 Message Date
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
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
67c6cc3fc0 tiny fix 2021-10-27 13:48:34 -03:00
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
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
silicons
d0eade8fe1 fix 2021-10-14 19:20:32 -07:00
DeltaFire
5680b74294 safety 2021-10-11 20:32:00 +02:00
DeltaFire
66e81e7fda asay ping time 2021-10-11 19:52:30 +02: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
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
silicons
0a75925df9 wack 2021-09-29 06:02:17 -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
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
Putnam
3b25f3e199 Started expanding auxgm a bit 2021-06-10 04:40:23 -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
keronshb
8f1db2d5ec Fixes some stuff 
Actually ticks the spell, fixes the brain damage issue, etc.
 2021-05-27 12:16:54 -04:00
keronshb
78db6bd5c2 Ports Floor Cluwnes 
Oh fuck oh god
 2021-05-26 21:58:35 -04:00
zerothebigboy
bd186d25cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 2021-05-23 15:29:20 -04:00
silicons
780a579c7b Update SDQL_2_wrappers.dm 2021-05-17 12:20:15 -07:00
Putnam
6c8fa56132 Adds make priority announcement verb 2021-05-06 15:10:36 -07: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
SandPoot
90661d3687 upload files 2021-04-24 21:37:01 -03:00
SandPoot
5bb6078def upload files 2021-04-22 20:39:21 -03:00
silicons
75e3f5eae6 Merge pull request #14573 from zeroisthebiggay/eatshitanddie 
pov: you're an enraged miner main that hates having their loot require a modicum of effort (ports tg ash drake)
 2021-04-21 13:50:46 -06: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
zerothebigboy
f1b45b3839 eatshitanddie 2021-04-05 21:55:17 -04:00
Blue Wildrose
3d8f8ffe27 Bringin' back the ding 2021-04-02 02:19:19 -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
Letter N
935e46b492 The Mapping Update 
Cleans up the map (again)
Makes mining code more better
 2021-03-12 12:11:35 +08:00
Letter N
a87e4533e5 support for tgs4 noconfigs needed*** 2021-03-03 17:33:14 +08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N
501d33cddd agony 2021-02-19 10:32:24 +08:00
Letter N
de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
Letter N
8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
zerothebigboy
85886f563f f 2021-02-08 16:59:54 -05:00
Letter N
f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
Timothy Teakettle
938b924a37 yes 2021-01-28 11:12:27 +00:00
Timothy Teakettle
8569c40ce5 Update adminpm.dm 2021-01-21 22:23:48 +00:00
Timothy Teakettle
401e6a7690 test 2021-01-21 20:17:25 +00:00
Letter N
125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
silicons
e680d58a03 fixes 2021-01-09 14:56:29 -08:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
Artur
9e16df56aa Ding for prayers 2021-01-04 23:23:55 +02:00
Letter N
cd5d558fad safety? what's that? 
* maybe table-breaking change
 2021-01-04 11:57:12 +08:00
Letter N
56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00
DeltaFire
c37bb9cc2a Merge pull request #13842 from Citadel-Station-13/silicons-patch-35 
deletes a tiny segment of dead code
 2020-12-22 17:56:13 +01:00