keronshb
60a3b134a3
Should fix the rest of the requested changes
...
Title
2020-02-09 17:30:22 -05:00
keronshb
9609eb64e0
Fixes some files and pathings for this
...
Adds proper subtypes, put the health down a lil bit for the turret, fixed the welder type, added some tiny fans to the ship and also added some plastitanium windows where r-windows were
2020-02-09 15:18:15 -05:00
TrilbySpaceClone
e5236eebb1
hey lets do corrections
2020-02-08 17:39:00 -05:00
TrilbySpaceClone
76219e0188
Primortial
2020-02-08 02:21:14 -05:00
Seris02
6d8bfd2a38
tru
2020-02-08 14:01:51 +08:00
Seris02
6af421994a
yay
2020-02-08 13:53:43 +08:00
Seris02
4ec99a38e2
merge fixes
2020-02-07 15:28:05 +08:00
kevinz000
75d3a8b35d
Merge pull request #10868 from Citadel-Station-13/Ghommie-patch-4
...
Holofans visual tweak.
2020-02-06 00:42:39 -07:00
keronshb
5d1d652ea4
Buffs the Pirate Ship to be bomb proof
...
Title, also makes a few computers/machines indestructible and buffs turret health. It also allows turrets to be repairable now.
2020-02-05 18:28:00 -05:00
Seris02
d0100345fd
done hopefully
2020-02-05 17:00:38 +08:00
Seris02
6cc6aa12be
yeehaw it's done
2020-02-05 16:54:57 +08:00
Ghommie
5dc1de1d04
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-05 04:34:54 +01:00
kevinz000
6a8a606f97
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-04 16:01:25 -07:00
kevinz000
f3d955f397
Merge branch 'master' into staves
2020-02-04 14:54:35 -07:00
kevinz000
97583bd98f
Merge pull request #10853 from Ghommie/Ghommie-cit549
...
A PR about runtime errors
2020-02-04 03:20:34 -07:00
TrilbySpaceClone
c8dff8fbc5
it just works
2020-02-04 04:18:44 -05:00
Ghommie
a726f09201
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-04 03:54:52 +01:00
kevinz000
8556bcf2b3
compile
2020-02-03 13:36:10 -07:00
kevinz000
3e30c9409b
riot staves
2020-02-03 13:11:26 -07:00
Ghom
ccd557122c
Update holosign.dm
2020-02-03 08:35:47 +01:00
Ghom
f2fd48bfd9
Update holosign.dm
2020-02-03 08:31:12 +01:00
kevinz000
341430eab5
Merge pull request #10836 from Hatterhat/rcd-carts-engifab
...
adding stuff to techfabs - RCD carts, combifans
2020-02-02 16:30:59 -07:00
Ghom
96a38e6c18
Merge pull request #10837 from Owai-Seek/tinytweaks
...
Tweaking Chef Vendor, Blood Crate, and Cake Recipe
2020-02-02 18:07:25 +01:00
Artur
e7ddfdd8d8
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-02-02 13:31:54 +01:00
kevinz000
33577e0d82
Merge pull request #10813 from Ghommie/Ghommie-cit540
...
Unicode support updates from tgstation.
2020-02-02 01:47:24 -07:00
kevinz000
2cdf7fa0bb
Merge pull request #10784 from Seris02/polycoats
...
polychromic winter coats
2020-02-02 01:46:58 -07:00
Ghommie
fedb05b3be
A PR about runtime errors
2020-02-02 05:43:38 +01:00
Seris02
18489e5b65
merge fixes
2020-02-02 11:51:26 +08:00
Seris02
d89e0de32c
yeehaw
2020-02-02 11:43:20 +08:00
Hatterhat
e985d21ea3
fucking combifan
2020-02-01 20:23:01 -06:00
Ghommie
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
Winter Flare
59b5b0b9a6
A bunch of tiny tweaks.
...
Added additional blood types to blood crate.
Added Soy Sauce packet.
Added Soy Sauce and BBQ packet to chef vendor.
Changed Birthday Cake recipie to mirror TG.
2020-02-01 04:49:56 -05:00
Trilbyspaceclone
4b7e5916bf
Update crates.dm
2020-02-01 01:09:35 -05:00
Ghommie
188f726ffd
unicode support port wip
2020-01-31 05:32:00 +01:00
Arturlang
83ce84cdc4
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
Seris02
dbb6218e0d
merp
2020-01-30 14:54:07 +08:00
kevinz000
3bf0e1d5c4
Merge pull request #10701 from Ghommie/Ghommie-cit527
...
Ported further runtime fixes by AnturK.
2020-01-28 17:57:26 -07:00
kevinz000
a1a2d45be6
Update closets.dm
2020-01-28 02:41:04 -07:00
kevinz000
611fd7ea89
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-27 23:35:35 -07:00
Seris02
e45cc4933c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
2020-01-27 08:33:38 +08:00
Ghom
5fd81c5233
Merge pull request #10717 from Putnam3145/meow-mix-fix
...
Makes "Meow Mix" bar sign actually appear
2020-01-26 05:45:55 +01:00
kevinz000
603ab65ed1
Merge pull request #10151 from Ghommie/Ghommie-cit450
...
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
2020-01-25 19:33:26 -07:00
Putnam
b36d2dc277
Makes "Meow Mix" bar sign actually appear
2020-01-25 13:56:25 -08:00
Ghom
00667eeecd
Merge pull request #10698 from Putnam3145/ghost-dojo-ban
...
Made ghost cafe mobs dust upon leaving, allowed ghost cafe bans
2020-01-25 15:25:26 +01:00
kevinz000
f199b720aa
Merge pull request #10689 from Ghommie/Ghommie-cit524
...
Even more runtime fixes.
2020-01-25 05:54:20 -07:00
kevinz000
a5404f6063
Merge pull request #10687 from Ghommie/Ghommie-cit523
...
A few more, ported, runtime fixes.
2020-01-25 05:54:03 -07:00
kevinz000
26459a156d
Merge pull request #10682 from Ghommie/Ghommie-cit519
...
Ports "Makes falsewall hide pipes and wires"
2020-01-25 05:53:07 -07:00
Artur
e360ac1d36
Conflict fix
2020-01-24 23:06:32 +01:00
Ghommie
856ef236f3
Further runtime fixes by AnturK.
2020-01-24 23:01:30 +01:00
Putnam
0493db0ac6
allowed dojo banning, made dojo mobs dust upon leaving
2020-01-24 09:11:33 -08:00
