SandPoot
c9055c4d65
minor issue
2023-02-21 16:34:10 -03:00
SandPoot
e0c8419cdd
deal with duct pipes
2023-02-21 16:09:35 -03:00
SandPoot
25deceb75f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-06-19 23:02:20 -03:00
TripleShades
ca57269f66
WHY DID THIS NOT GET TESTED EVER
2022-06-15 17:29:17 -04:00
SandPoot and GitHub
fac92f66ca
You can now make shuttle seats with titanium ( #255 )
...
* Update mineral.dm
* consistency
2022-05-23 23:04:24 -03:00
SandPoot
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
SandPoot
ada0ea7f32
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:40:23 -03: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 and GitHub
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
66b05f5261
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-06 16:40:58 -03:00
SandPoot and GitHub
c8df97474b
Adds pick-up, drop and throw sounds for items. ( #240 )
2022-04-01 15:57:30 -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
SandPoot
ed053988d8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-24 22:11:23 -03:00
9370f6423c
Craftable brass plant and suits. ( #197 )
...
* craftable plant and suits
* Update code/game/objects/items/stacks/sheets/sheet_types.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* Update sheet_types.dm
* Update modular_sand/code/game/objects/structures/fauna.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* Update modular_sand/code/game/objects/structures/fauna.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* Update modular_sand/code/game/objects/structures/fauna.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
2021-11-19 15:21:37 -03:00
SandPoot
5b85c260a7
Upload files
2021-11-15 01:34:30 -03:00
SandPoot
e5badd2e09
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-27 13:31:55 -03:00
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
e7d5275a70
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-09-20 14:32:29 -03:00
silicons and GitHub
8d914571e8
Merge pull request #15094 from zeroisthebiggay/patch-20
...
removes building (fortnite) windows
2021-09-19 11:09:55 -07:00
SandPoot
4b1df1bfb3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-09-13 10:18:55 -03: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
SandPoot
e3c17dc05e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-09-09 01:57:47 -03:00
zeroisthebiggay and GitHub
70b0dad62d
Update glass.dm
2021-09-07 03:26:39 -04:00
zerothebigboy
ccfde52b0d
code
2021-09-02 23:45:03 -04:00
zerothebigboy
0e95e1a8ad
cool
2021-09-01 05:14:17 -04:00
SandPoot
dd09f0b785
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-07-19 02:57:23 -03:00
silicons and GitHub
89d0c590e6
Merge pull request #14943 from WanderingFox95/WanderingFox95-custom-kegs
...
Custom Kegs
2021-07-18 15:06:30 -07:00
WanderingFox95 and GitHub
2e88a10ca6
Recipe
2021-07-15 01:50:44 +02:00
YakumoChen and GitHub
42fed8a8fe
craftable human hats
2021-07-05 04:58:52 +00:00
SandPoot
91fd04c552
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-06-10 23:41:21 -03: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
SandPoot
0313149d1c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-05-08 02:43:01 -03:00
SandPoot and GitHub
04ea151153
Adds Loincloths ( #159 )
2021-05-04 13:22:10 -03:00
WanderingFox95 and GitHub
3ea98d3096
Merge branch 'master' into WanderingFox95-TheUnrollingPin
2021-04-29 10:54:00 +02:00
WanderingFox95 and GitHub
6c9ead8f1c
Adds the Recipe to Wood Crafting
2021-04-26 18:42:33 +02:00
SandPoot
bab386168e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-04-18 23:23:02 -03:00
Hatterhat and GitHub
4186b15a69
plastitanium glass OSC
2021-04-17 16:51:08 -05:00
SandPoot
0165c4a7c0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-04-10 12:34:59 -03:00
LetterN
f976a89157
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-31 08:19:31 +08:00
SandPoot
1a7d33b801
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-03-27 11:41:32 -03:00
CuteMoff and GitHub
dd295d20c2
Merge branch 'master' into Plasmaispogtake2
2021-03-25 10:44:12 -04:00
CuteMoff and GitHub
3efce37fd9
Update mineral.dm
2021-03-25 10:32:13 -04:00
SandPoot
73c0ff2f8d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-03-24 23:57:03 -03:00
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 and GitHub
a51a1ae68f
Update mineral.dm
2021-03-23 21:24:11 -04:00
CuteMoff and GitHub
048b8548ad
Update mineral.dm
2021-03-23 20:53:07 -04:00
CuteMoff and GitHub
428591c452
Update mineral.dm
2021-03-23 20:36:48 -04:00
SandPoot