686a76dd1d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-04 13:35:05 +01:00
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
0f9c3350cd
Merge pull request #10189 from Putnam3145/storytellers
...
n word
2020-01-02 22:01:19 -06: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
6e5d04ff1f
Adding a way to make opaque plastic flaps
2020-01-02 02:52:48 -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
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
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
c81d0e8b66
Update energy.dm
2019-12-31 05:25:12 -05: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
d8c9dd967b
Dolly Dress-Up: Ghost Hunter Edition
2019-12-30 14:31:47 -08:00
e309497af2
Merge pull request #10339 from Seris02/teleivdrip
...
telescopic IV drips
2019-12-30 18:24:50 +01:00
f0ba93052d
yee2.
2019-12-30 23:53:10 +08:00
bebd1a4600
yee.
2019-12-30 23:52:36 +08:00
283ccceb24
CE Locker Exodus: The Removaling
...
Removes junk from the CE locker.
Adds empty engineering lockers.
I don't know how to do this as a child and not have populate contents fill the child.
2019-12-30 09:25:03 +00:00
fef66b1bd7
Merge pull request #10320 from Seris02/exclusion
...
excludes certain ghost roles from being affected by health events
2019-12-30 00:26:19 -08:00
47c92e380c
Merge branch 'master' into throwing_disarm_stuff
2019-12-30 00:05:17 -08:00
310d343242
Merge pull request #10095 from Ghommie/Ghommie-cit443
...
Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
2019-12-30 00:03:21 -08:00
cc087b990c
Code improvements
2019-12-29 21:01:55 -08:00
40730b48d5
few fixes
2019-12-30 11:49:16 +08:00
f1292c503c
makes it a trait
2019-12-30 11:33:15 +08:00
f663c4db96
tiny fixes
2019-12-30 11:24:12 +08:00
ddf233e0d5
Made no antags show up after auto call
2019-12-29 18:53:49 -08:00
93207cae0b
made "random" more random
2019-12-29 18:53:27 -08:00
fa35c5128c
Rebalancing bloodsuckers a tad
2019-12-29 18:09:23 -08:00
4a5715e5ac
Update belt.dm
2019-12-29 19:13:32 -05:00
edd05cebea
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
2019-12-30 00:28:36 +01:00
68c9a371d9
Made story *purely* story, no extended-weighting
2019-12-29 10:56:48 -08:00
b96bcf6eec
tiny fix
2019-12-29 23:47:30 +08:00
9b3654e4ff
telescopic IVs
2019-12-29 23:26:53 +08:00
a39c0249c4
marshmallow
2019-12-29 21:55:25 +08:00
0ac0558417
balancing is good
2019-12-28 20:16:14 -08:00
Ghommie