shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,997 Commits 5 Branches 0 Tags
11df2bb77c4f6fdf360e216e0eca91cda959d32e
Commit Graph
9888 Commits
Author SHA1 Message Date
Putnam3145 c06983ce09 uh... does this? 2021-06-21 09:27:32 -07:00
Putnam3145 0bf383a90b does this fix it 2021-06-21 09:18:06 -07:00
siliconsGitHubPutnam3145
 		98ff06fa1a the roasted roasted roasted roasted roasted roasted roasted roasted......... (#14850) 
* Update misc.dm

* Update code/game/objects/items/melee/misc.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* Update misc.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-06-21 17:54:56 +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
Putnam3145 e65f13637d Made hotspots take generic fires into account 2021-06-20 18:09:11 -07:00
siliconsandGitHub 29604b939c Update glowshroom.dm 2021-06-20 13:18:54 -07:00
siliconsandGitHub d704fec039 Update stunbaton.dm 2021-06-20 11:08:46 -07:00
siliconsandGitHub 54d114ce02 Update stunbaton.dm 2021-06-20 11:06:40 -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
siliconsandGitHub 8f3c1fe03a Update glowshroom.dm 2021-06-19 07:02:51 -07:00
siliconsandGitHub c0e3af55bc Update glowshroom.dm 2021-06-19 06:59:26 -07:00
siliconsandGitHub 4768b23398 Merge pull request #14860 from Arturlang/nanite_updates 
Updates our nanite stuff to TG's, mostly
 2021-06-18 20:01:05 -07:00
siliconsandGitHub bc4773b728 Merge pull request #14831 from zeroisthebiggay/beltsprites 
TG Resprite Compendium Atomization Project | Episode Six: Beltslot Sprites & Telebaton Resprite
 2021-06-18 19:58:27 -07:00
siliconsandGitHub a8b7c07f00 Update open.dm 2021-06-17 07:07:49 -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
silicons c1928c9446 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-16 19:04:16 -07:00
Artur 724b34f55d https://github.com/tgstation/tgstation/pull/54710 2021-06-16 00:44:32 +03:00
LinandGitHub 4ae09baa63 Merge pull request #14834 from silicons/on_found 
Fixes on_found triggering on storage
 2021-06-14 20:15:42 -07:00
silicons 01e0fa16fe it works. 2021-06-14 13:52:48 -07:00
silicons b04a580e1d it works 2021-06-13 22:19:06 -07:00
silicons 8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -07:00
silicons e7f5f80fb1 yelling 2021-06-13 15:34:47 -07:00
zerothebigboy a64d94a7cc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites 2021-06-13 18:25:35 -04:00
zerothebigboy bae89fcaba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites 2021-06-13 18:19:01 -04:00
zerothebigboy 319e03476b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into miscsprites 2021-06-13 18:16:08 -04:00
siliconsandGitHub f56e95e4e7 Merge pull request #14841 from MrJWhit/revert-14762-patch-2 
Revert "adds cat meteors"
 2021-06-13 15:15:59 -07:00
siliconsandGitHub 431acd9d5c Merge pull request #14820 from qweq12yt/more-cargo-stuff 
[FIX] Some cargo related fixes
 2021-06-13 15:15:20 -07:00
siliconsandGitHub b77da2824a Merge pull request #14830 from zeroisthebiggay/dishdrive 
TG Resprite Compendium Atomization Project | Episode Five: Dish Drives
 2021-06-13 15:14:30 -07:00
siliconsandGitHub 211fed05d7 Merge pull request #14829 from zeroisthebiggay/singulohammer 
TG Resprite Compendium Atomization Project | Episode Four: Singularity Hammers
 2021-06-13 15:14:04 -07:00
MrJWhitandGitHub a324701730 Revert "adds cat meteors" 2021-06-13 05:25:02 -04:00
silicons b6bb20842f Yelling works 2021-06-13 00:50:00 -07:00
zerothebigboy e757f9ea2c thetwentythirdofmany 2021-06-12 17:41:09 -04:00
silicons 8feb473e65 fixes 2021-06-12 04:49:23 -07:00
zerothebigboy e0a311435b thetwentysecondofmany 2021-06-11 20:53:35 -04:00
zerothebigboy 3fae79f876 thetwentyfirstofmany 2021-06-11 20:28:25 -04:00
zerothebigboy b7eecc315f theeighteenthofmany 2021-06-11 19:49:43 -04:00
zerothebigboy 53e95b7356 theseventeenthofmany 2021-06-11 19:48:04 -04:00
zerothebigboy 4486b08bd4 thefifteenthofmany 2021-06-11 19:33:51 -04:00
Putnam 78cf3463ba Updates to master 
Closes #14823
 2021-06-11 16:29:04 -07: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 8a5a5ef6cc thethirteenthofmany 2021-06-11 19:22:05 -04:00
zerothebigboy 39d951a4a8 thesixthofmany 2021-06-11 18:24:29 -04:00
qweq12yt 0ca61af62a fixed combo lockers 2021-06-10 16:50:44 -03:00
Putnam 3b25f3e199 Started expanding auxgm a bit 2021-06-10 04:40:23 -07:00
zeroisthebiggayandGitHub c6a70b9a4e Update weaponry.dm 2021-06-09 18:37:11 -04:00
zerothebigboy fba4b1966c painful 2021-06-09 18:30:32 -04:00
zerothebigboy 190edf57e8 painful 2021-06-09 18:28:21 -04: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
siliconsandGitHub a77aa8bd41 Merge pull request #14766 from Linzolle/cultfix 
Fix cult area shenanigans, cult can do stuff in maint again.
 2021-06-09 11:22:26 -07:00
siliconsandGitHub 224efa0e26 Merge pull request #14762 from DrPainis/patch-2 
adds cat meteors
 2021-06-09 11:21:55 -07:00