f7aa4f3050
Merge branch 'master' into glassware
2020-01-06 23:55:44 -05:00
f6b9396096
Merge pull request #10439 from LetterN/tachelon-logs
...
doppler logs
2020-01-06 19:45:28 -08:00
2ce3b7fbf5
Merge pull request #10455 from Ghommie/Ghommie-cit501
...
Porting some runtime fixes.
2020-01-07 01:00:25 +00:00
718d4a080d
Merge pull request #9878 from Ghommie/Ghommie-cit382
...
Unmodularize several machinery and structures
2020-01-07 00:31:24 +00:00
d07d436ba2
Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo
...
cargo tweaks, new shit, why do digitigrade sprites exist
2020-01-06 21:47:15 +01:00
dcb2ae77fa
Porting some runtime fixes.
2020-01-06 02:14:25 +01:00
de14073956
limit
2020-01-06 08:34:48 +08:00
e18244671f
Merge pull request #10350 from Putnam3145/dojo-ghostrole
...
Ghost cafe quality-of-life, plus making ghost role eligibility an element
2020-01-05 23:05:13 +01:00
516ec585d2
Merge pull request #10435 from Hatterhat/tg-40394
...
biogenerator can print flour sacks and enzyme now, also some boxes idk
2020-01-05 16:22:44 +01:00
eeb9ec5f35
Merge pull request #10380 from Hatterhat/tg-43000-powerfists
...
powerfists throw people faster but also leak their gas into the air
2020-01-05 15:12:06 +01:00
ba7f0dab62
doppler logs!
2020-01-05 19:16:37 +08:00
f166586ca0
a comma
2020-01-04 21:05:55 -06:00
5b0d20cf37
this one fucking tab
2020-01-04 19:52:01 -06:00
46ced736ba
what the fuck was that damage my guy
2020-01-04 19:51:06 -06:00
07a5f052d3
Merge pull request #10400 from chefferz/chefferz-toiletshuttle
...
Gives ability to buckle yourself to a toilet
2020-01-04 14:25:54 +01:00
3086b5eb38
boolean
2020-01-04 14:19:15 +01:00
92f6fe129a
tgstation 40394 port
2020-01-04 07:14:39 -06:00
499907f9b7
Merge pull request #10191 from Citadel-Station-13/michael_labs
...
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
2020-01-04 14:07:25 +01:00
39da7cc58e
Merge pull request #10419 from Citadel-Station-13/kevinz000-patch-6
...
HELP I CANT POWERGAME NANITES IF I CANT MAKE NANITE MACHINES (please testmerge these things more)
2020-01-04 14:03:01 +01:00
5142a0e4ae
that should probably be there
2020-01-04 02:07:19 -06:00
7c98656939
upstream merge
2020-01-04 01:48:50 -06:00
186194418e
tg 43454+43688 port, tweaks w/ trilby, db crate
2020-01-04 01:33:32 -06:00
d0263fc669
don't act on non mobs
2020-01-03 18:21:08 -06: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
04649efc62
Update stack.dm
2020-01-03 02:46:57 -08: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
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
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
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
Trilbyspaceclone