d1d9b7a179
Merge pull request #10403 from r4d6/patch-1
...
Add a way to make opaque plastic flaps
2020-01-03 08:16:17 -08:00
04649efc62
Update stack.dm
2020-01-03 02:46:57 -08:00
519d379cdf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atmosfirelock
2020-01-03 17:42:53 +08:00
a4d2ea0281
Small fix
2020-01-03 22:39:58 +13:00
7347cb0ba6
Merge branch 'master' into RCD-Updates
2020-01-03 03:09:11 -05:00
8e1affa1f5
nightshift changes
2020-01-02 23:56:40 -08:00
5c94e02eac
Add simple RCD Circuits
...
Port : https://github.com/tgstation/tgstation/pull/45357
2020-01-03 02:32:43 -05:00
15d79d8818
RCD don't work on R-Doors
...
Port : https://github.com/tgstation/tgstation/pull/43598
2020-01-03 02:14:41 -05:00
37d50e2aaf
Add RCD effects
...
Port : https://github.com/tgstation/tgstation/pull/47894 & https://github.com/tgstation/tgstation/pull/48362/files
2020-01-03 02:13:20 -05:00
5e3abec704
Removing turf with RCD cost mats.
...
Port : https://github.com/tgstation/tgstation/pull/46801
2020-01-03 02:06:47 -05:00
adf87c7595
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole
2020-01-02 22:52:24 -08:00
0f9c3350cd
Merge pull request #10189 from Putnam3145/storytellers
...
n word
2020-01-02 22:01:19 -06:00
2931cb6757
Merge branch 'master' into glassware
2020-01-02 20:30:20 -05:00
f7b91f9b65
Merge pull request #10238 from Ghommie/Ghommie-cit478
...
Brings in some mapping code updates.
2020-01-03 00:01:54 +00:00
b1ccd512db
Merge pull request #10215 from Ghommie/Ghommie-cit473
...
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
2020-01-03 00:00:51 +00:00
a102bb18a0
Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit
2020-01-02 09:39:48 -08:00
4d06d231f8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2020-01-02 17:49:01 +01:00
08d042901c
thank you github
2020-01-02 22:16:47 +13:00
aabb39a364
Revert "Merge branch 'master' into Yeehaw"
...
This reverts commit 30e3edaac162c8fce043
2020-01-02 22:06:31 +13:00
30e3edaac1
Merge branch 'master' into Yeehaw
2020-01-02 22:03:58 +13:00
3239acf74d
Sync
2020-01-02 22:02:55 +13:00
6e5d04ff1f
Adding a way to make opaque plastic flaps
2020-01-02 02:52:48 -05:00
46feaf9663
Update watercloset.dm
2020-01-02 01:09:29 -05:00
e771ea9066
Merge pull request #10374 from Trilbyspaceclone/patch-260
...
[s] Fixes Dragon's Tooth Sword 50% armor penetration by making it 35%
2020-01-01 22:07:18 -08:00
be9912227f
Merge pull request #10372 from Hatterhat/the-one-with-the-forcefields
...
forcefield projectors on toolbelts, cool and good sprites for atmos holofan/forcefield proj
2020-01-01 20:28:15 -06:00
6222b41204
Update forcefieldprojector.dm
2020-01-01 20:44:16 -05:00
96cbc2704f
Made random always available.
2020-01-01 00:32:49 -08:00
d6fece9a57
removed extended weighting on intrigue
2020-01-01 00:28:39 -08:00
094d225874
Merge remote-tracking branch 'citadel/master' into michael_labs
2019-12-31 19:54:01 -08:00
ef36b9df75
i love democracy
2019-12-31 21:44:03 -06:00
1051d99fdf
Merge pull request #10361 from CameronWoof/fashion-ghosts
...
Ghost Cafe patrons now spawn with chameleon kits
2019-12-31 19:28:55 -08:00
58e50de434
grampa ghommles doesn't like kids and their newfangled technology and also the VA denied his claim and now he hates bureaucracy
2019-12-31 17:44:18 -08:00
b651bbcdb3
Merge branch 'master' into Ghommie-cit367
2019-12-31 22:37:59 +00:00
cba4bc27ef
Merge pull request #10349 from KathrinBailey/CE-locker
...
CE Locker Vengeance: The Removaling + Welding locker consistency changes + Empty lockers for mappers
2019-12-31 18:01:23 +01:00
243aebe12a
dab 2x
2019-12-31 16:54:59 +00:00
0a19f62fa9
dab
2019-12-31 16:45:06 +00:00
f2e9ba2a8e
Makes lockers into subtypes
...
Adds new lockers cleanly at the bottom instead and as subtypes.
2019-12-31 16:41:23 +00:00
0453363d4c
Merge pull request #10345 from Trilbyspaceclone/patch-256
...
Buffs bandoliers to hold more types of casings.
2019-12-31 14:36:53 +01:00
78e4c608ad
Merge pull request #10319 from Seris02/coconutsyep
...
porting azarak's coconuts from hyper station
2019-12-31 13:16:07 +01:00
cf77f7b18e
Balance pass (see description)
...
1. Made bloodsuckers more likely on calm, story, slightly more common on intrigue
2. Made intrigue no longer have low threat by default
3. Made abductors have lower weights in general, making them less likely to show up
4. Made sentient disease, revenant less likely on calm
5. Added a new storyteller, "Conversion", which rolls conversion antags.
2019-12-31 02:40:50 -08:00
8085022d97
Couple of changes. Starting on the point bank.
2019-12-31 23:28:30 +13:00
c81d0e8b66
Update energy.dm
2019-12-31 05:25:12 -05:00
54f859fe06
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2019-12-31 17:52:49 +08:00
5a497b02ac
hey i'm WALKIN here
2019-12-31 01:56:01 -06:00
79c609aa40
Update telescopic_iv.dm
2019-12-30 17:55:59 -08:00
018904694f
caps
2019-12-30 17:03:06 -08:00
5c13fa64e3
Merge pull request #10338 from Seris02/marshmallow
...
marshmallow
2019-12-30 18:31:06 -06:00
8a4e44758f
Merge pull request #10165 from Ghommie/Ghommie-cit456
...
Minor underwear fixes and tweaks.
2019-12-30 18:28:48 -06:00
23f79ffed8
Merge pull request #10123 from Citadel-Station-13/throwing_disarm_stuff
...
throwing now only randomly turns things if you are on harm intent
2019-12-30 18:28:16 -06:00
b5ccbe86c0
Halved midround antag injection chance on calm
2019-12-30 15:40:20 -08:00
kevinz000