Commit Graph

603 Commits

Author SHA1 Message Date
shellspeed1
b4f886d999 port of https://github.com/tgstation/tgstation/pull/49111 aka sales taggers, credit to ArcaneMusic 2022-09-18 20:55:22 -07:00
Linzolle
cd1389ae0f fix catwalks 2022-08-02 22:59:59 -07:00
TripleShades
ca57269f66 WHY DID THIS NOT GET TESTED EVER 2022-06-15 17:29:17 -04:00
SandPoot
695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
silicons
dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot
16fddbb140 Upload files 2022-03-18 18:35:29 -03:00
DeltaFire
074fe5b417 a bunch of stuff
5° min temp adjustment for active cooling
150% max total cooling efficiency as opposed to 100%
passive heating cools instead at >100% efficiency (to -30°C min)
EMPs jam cooling system readouts.
Nanogel is now printable, for a decent price though it needs a bit of diamond.
2022-01-02 19:44:35 +01:00
SandPoot
5b85c260a7 Upload files 2021-11-15 01:34:30 -03: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
WanderingFox95
4b13d1772c [Ready] Bone Anvil and processable Bone ingots (#15290)
* Adding all the extra stuff

* whoops, slipped my last fix in here.

* bone balance

* 6 Goliaths + 3 Watchers + 1 Legion

* bumps the damage modifier down to 1.05

* More Bones.

* Undoes the undoing of the other fix PR

Co-authored-by: Emily <null>
2021-10-25 18:11:54 +02: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
silicons
8d914571e8 Merge pull request #15094 from zeroisthebiggay/patch-20
removes building (fortnite) windows
2021-09-19 11:09:55 -07:00
zerothebigboy
68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners 2021-09-10 12:12:57 -04:00
zeroisthebiggay
70b0dad62d Update glass.dm 2021-09-07 03:26:39 -04:00
zerothebigboy
e53223a149 unversioned 2021-09-02 23:50:38 -04:00
zerothebigboy
ccfde52b0d code 2021-09-02 23:45:03 -04:00
zerothebigboy
fe90ea3ef4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into headass 2021-09-01 05:14:27 -04:00
zerothebigboy
0e95e1a8ad cool 2021-09-01 05:14:17 -04:00
keronshb
e7b6c9ab5e Catwalk Flooring 2021-08-22 22:41:48 -04:00
silicons
59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates
Ports update appearance
2021-08-08 04:06:18 -07:00
Artur
cdbd585f4d update_appearance 2021-07-28 02:13:57 +03:00
Putnam3145
f1560cb807 fixing a bunch of unit test/runtime issues 2021-07-25 18:40:11 -07:00
silicons
89d0c590e6 Merge pull request #14943 from WanderingFox95/WanderingFox95-custom-kegs
Custom Kegs
2021-07-18 15:06:30 -07:00
WanderingFox95
2e88a10ca6 Recipe 2021-07-15 01:50:44 +02:00
YakumoChen
42fed8a8fe craftable human hats 2021-07-05 04:58:52 +00: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
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
WanderingFox95
3ea98d3096 Merge branch 'master' into WanderingFox95-TheUnrollingPin 2021-04-29 10:54:00 +02:00
WanderingFox95
6c9ead8f1c Adds the Recipe to Wood Crafting 2021-04-26 18:42:33 +02:00
Hatterhat
4186b15a69 plastitanium glass OSC 2021-04-17 16:51:08 -05:00
LetterN
f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
CuteMoff
dd295d20c2 Merge branch 'master' into Plasmaispogtake2 2021-03-25 10:44:12 -04:00
CuteMoff
3efce37fd9 Update mineral.dm 2021-03-25 10:32:13 -04:00
LetterN
e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-24 21:55:47 +08:00
CuteMoff
ea200acd9f Update code/game/objects/items/stacks/sheets/mineral.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
2021-03-23 23:17:24 -04:00
CuteMoff
a51a1ae68f Update mineral.dm 2021-03-23 21:24:11 -04:00
CuteMoff
048b8548ad Update mineral.dm 2021-03-23 20:53:07 -04:00
CuteMoff
428591c452 Update mineral.dm 2021-03-23 20:36:48 -04:00
LetterN
228105b391 laptop and closet decon fix 2021-03-16 14:47:28 +08: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
c624c3ae14 economical inflation 2021-03-05 20:00:45 +08:00
Letter N
cb346a3847 a 2021-03-05 14:29:36 +08:00
Letter N
45278c02a2 send it 2021-03-04 16:41:42 +08:00
Letter N
7e427aa8e6 HOTFIX AEIOU 2021-03-04 16:20:44 +08:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00