shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,171 Commits 5 Branches 0 Tags
a32eabb7ae7ca98cc815d78ac5c09412b6029bf5
Commit Graph
4548 Commits
Author SHA1 Message Date
Putnam3145 37fe5f297c fix double . in fusion scan 2021-06-22 22:38:20 -07:00
WanderingFox95andGitHub e709d5cf0c More code. Shouldn't break anything. 
We'll see if it does.
 2021-06-22 13:35:37 +02: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
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
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 01e0fa16fe it works. 2021-06-14 13:52:48 -07:00
silicons 8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -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
zerothebigboy e757f9ea2c thetwentythirdofmany 2021-06-12 17:41:09 -04: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
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
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
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 0ee2892bee Merge pull request #14807 from Putnam3145/make-sleeper-pref-good 
makes medihound sleeper toggle do something
 2021-06-09 11:17:39 -07: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
Putnam fcd1ec83cc removed redundant check 2021-06-08 00:25:31 -07:00
Putnam f6e08a8d2a include a message too 2021-06-08 00:24:54 -07:00
Putnam a236357ebe makes medihound sleeper toggle do something 2021-06-08 00:21:19 -07:00
silicons 1a800cc470 modifications 2021-06-07 19:40:16 -07:00
silicons 40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
Putnam d03bf641dd extreme optimization project to maybe fix game 2021-06-06 21:58:24 -07:00
DeltaFire dd33371a3b colors 2021-06-01 22:48:57 +02:00
siliconsandGitHub cb52be5dd9 fixes linter warnings (#14778) 
* woo

* woo
 2021-05-31 10:19:20 -05:00
Linzolle 0cf7c5070d parentheses 2021-05-27 19:45:12 -05:00
Linzolle 46833abf0b add cult_permitted area flag 2021-05-27 19:34:00 -05:00
Putnam e580c504fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-05-21 18:52:16 -07:00
WanderingFox95andGitHub 502092f284 changed sound path 2021-05-17 12:40:37 +02:00
WanderingFox95andGitHub 1d56b9ceda E-Fink 2021-05-17 12:31:46 +02:00
Timothy TeakettleGitHubDeltaFire
 		739b7cea26 borg spraycans have a five second delay before being able to knock someone down again (#14627) 
* Update crayons.dm

* Update crayons.dm

* kevin review changes

* Update crayons.dm

* Update code/game/objects/items/crayons.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-05-14 17:47:40 +02:00
siliconsandGitHub 4afb5209a1 Merge pull request #14637 from TheObserver-sys/DerringerPass1 
Derringer Pass 1: No Rest for the Wicked(ly Bad Coder {me})
 2021-05-07 18:42:24 -06:00
siliconsandGitHub 44fdbaadcb Merge pull request #14684 from zeroisthebiggay/pirates 
Pirate Update: Milk Is Not A Medical Substitute
 2021-05-07 18:40:41 -06:00
zerothebigboy c8ebe720ec k 2021-05-05 18:25:05 -04:00
Artur d9f6e51bc8 making it actually work properly 2021-05-05 15:26:20 +03:00
zerothebigboy 5138d86655 skylarlineman'safurry 2021-05-05 03:35:25 -04:00
WanderingFox95andGitHub 3ea98d3096 Merge branch 'master' into WanderingFox95-TheUnrollingPin 2021-04-29 10:54:00 +02:00
siliconsandGitHub e3755fba92 Merge pull request #14639 from necromanceranne/cyberorgan_stuff_ye 
Ports a significant amount of the tg cybernetic organ code + more
 2021-04-28 21:20:57 -06:00
siliconsandGitHub 986aef27b2 Merge pull request #14648 from SandPoot/decal-painter-tgui 
Decal Painter menu is no longer shit and has visible previews.
 2021-04-28 21:20:24 -06:00