BongaTheProto
085bb06e94
Merge remote-tracking branch 'upstream/master'
2023-09-16 14:32:38 -05:00
SandPoot
0b04af4b76
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-09-14 22:32:47 -03:00
SandPoot
3c7e79d384
do after update
2023-09-09 15:39:49 -03:00
BongaTheProto
2151624f10
Merge remote-tracking branch 'upstream/master'
2023-02-22 19:14:08 -05:00
SandPoot and SandPoot
2bdec078d7
Merge pull request #311 from Sandstorm-Station/duct-piping
...
Several duct pipe fixes/qol
2023-02-21 16:44:35 -03:00
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
Fabian272
939d0bcfd0
Changes the kinkmate loincloth to have sensors, changes loincloth crafting to have sensored and sensorless versions.
2022-11-07 21:36:42 +01:00
BongaTheProto
0b89d8c778
Merge remote-tracking branch 'upstream/master'
2022-06-20 01:08:17 -05: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
BongaTheProto
4735651dd4
Merge remote-tracking branch 'upstream/master'
2022-05-24 09:35:48 -05: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
BongaTheProto
6ada3f7c94
Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen
2022-04-18 21:36:14 -05:00
SandPoot
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
BongaTheProto
a4fac709c3
Merge remote-tracking branch 'upstream/master'
2022-04-09 11:43:45 -05: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
BongaTheProto and GitHub
f5af499eee
Merge branch 'Sandstorm-Station:master' into master
2022-04-06 16:01:25 -05:00
SandPoot
66b05f5261
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-06 16:40:58 -03:00
BongaTheProto and GitHub
5a6b1b9dc7
Merge branch 'Sandstorm-Station:master' into master
2022-04-01 19:42:35 -05: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
BongaTheProto
8badaaf8ec
the thing
...
the
2022-03-04 19:51:12 -05:00
E
58b195acc0
also because someone asked
2021-12-08 20:05:43 +01:00
E
dc2b87d382
me using the wrong branch be like
2021-12-07 19:05:10 +01:00
E
52d4143c83
yeet
2021-12-02 00:59:39 +01: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
BongaTheProto