Commit Graph

9589 Commits

Author SHA1 Message Date
silicons
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
silicons
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
silicons
a8b7c07f00 Update open.dm 2021-06-17 07:07:49 -07:00
Artur
724b34f55d https://github.com/tgstation/tgstation/pull/54710 2021-06-16 00:44:32 +03:00
Lin
4ae09baa63 Merge pull request #14834 from silicons/on_found
Fixes on_found triggering on storage
2021-06-14 20:15:42 -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
silicons
f56e95e4e7 Merge pull request #14841 from MrJWhit/revert-14762-patch-2
Revert "adds cat meteors"
2021-06-13 15:15:59 -07:00
silicons
431acd9d5c Merge pull request #14820 from qweq12yt/more-cargo-stuff
[FIX] Some cargo related fixes
2021-06-13 15:15:20 -07:00
silicons
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
silicons
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
MrJWhit
a324701730 Revert "adds cat meteors" 2021-06-13 05:25:02 -04:00
zerothebigboy
e757f9ea2c thetwentythirdofmany 2021-06-12 17:41:09 -04:00
silicons
8feb473e65 fixes 2021-06-12 04:49:23 -07: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
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
silicons
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
silicons
224efa0e26 Merge pull request #14762 from DrPainis/patch-2
adds cat meteors
2021-06-09 11:21:55 -07:00
silicons
564a3aaa4b Merge pull request #14796 from MrJWhit/the-pr-that-gets-people-pissed
Moves medical holodeck to restricted
2021-06-09 11:18:32 -07:00
silicons
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
silicons
a7781f77fd Merge pull request #14802 from bunny232/atmosfoam
Atmos resin buff? fix?
2021-06-09 11:15:56 -07:00
silicons
259aed7903 Merge pull request #14783 from DeltaFire15/spec-species-color
Colors species names depending on traits
2021-06-09 11:14:48 -07:00
silicons
fe8323f503 Merge pull request #14747 from keronshb/reinforcedplasmawindowsteps
Adds more deconstruction steps to stronger windows.
2021-06-09 11:13:13 -07:00
silicons
716c2a04e4 Merge pull request #14160 from keronshb/motivation
Adds a new traitor item, Motivation (Part 1)
2021-06-09 11:10:17 -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
bunny232
7826ced174 Update effects_foam.dm 2021-06-06 12:54:07 -04:00
MrJWhit
2db540aae3 Update holodeck.dm 2021-06-04 20:53:34 -04:00
Lin
a31c99e361 Merge pull request #14786 from Arturlang/fixes_float
Fixes float()
2021-06-04 12:13:36 -05:00
Artur
f631879b88 fixes_float 2021-06-02 14:27:22 +03:00
DeltaFire
dd33371a3b colors 2021-06-01 22:48:57 +02:00
silicons
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
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
keronshb
13b589507d Clown Spawner
For admin fun!
2021-05-24 15:13:41 -04:00
keronshb
7458909970 Switched heated screws to solder. 2021-05-23 13:36:03 -04:00
keronshb
8787caccba Fixes the roundstart deconstruction issue 2021-05-22 14:12:31 -04:00
keronshb
bd05dd29b6 ReinforcedPlasmaSteps
Adds more steps for deconning stronger windows
2021-05-22 13:58:01 -04:00
Lin
0c77834c56 Merge pull request #14733 from qweq12yt/misc-fixes
[Fix] Even More bug fixing
2021-05-19 14:49:00 -05:00
qweq12yt
ba20b5b8aa fix emag shuttle order 2021-05-17 18:48:01 -03:00
WanderingFox95
502092f284 changed sound path 2021-05-17 12:40:37 +02:00