2b3f00ed1e
Fix Freezer overlay bug
2020-01-18 22:16:43 -05:00
bd30b44919
Bounty Reorganisation and Rebalance
...
Reorganises several bounties.
Rebalances or Buffs Skateboard, Stunprod, Shady Jims, Gas Mask, Soup, Ice Cream Sandwiches, Popcorn, Onion Rings, Night Vision Goggles, Tool Belts, possibly others.
Moves:
Khinkali to Chef Bounties
Super Bite to Chef Bounties
Poppy Pretzels to Chef Bounties
Adds:
Fiesta Skewer Bounty
Pneumatic Cannon Bounty
BBQ Ribs Bounty
Add's Trillby's Toy Sword Bounty
Fix:
Shady Jims were unobtainable, they are now obtainable.
2020-01-18 21:59:03 -05:00
0a5e2cf8ff
Merge pull request #10601 from Putnam3145/dojo-hilbert
...
Adds 16777216 dorms to the ghost dojo
2020-01-19 03:02:32 +01:00
1eec1b11dd
Update passive_vent.dm
2020-01-18 20:00:07 -05:00
ae5e87d492
Apparently TG has more code than us
2020-01-18 19:12:00 -05:00
5084146400
Port
2020-01-18 18:46:22 -05:00
072eca6ec0
fixes and more PRs
2020-01-18 23:01:00 +01:00
3ee855ab77
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-18 22:14:06 +01:00
ca7bdf5f88
clockwork cuirass now compatible with snakes. The original author is very lazy.
2020-01-18 22:06:14 +01:00
810556cbb7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Passive-Vents
2020-01-18 16:03:49 -05:00
760bbfa8b6
Merge pull request #10571 from Ghommie/Ghommie-cit507
...
Riot foam dart design cost consistency.
2020-01-18 20:46:16 +00:00
d709edb1c2
Merge pull request #10578 from r4d6/Mining
...
Port TG's Mining changes
2020-01-18 20:32:14 +01:00
ce2fc37df3
Merge pull request #10501 from Putnam3145/more-atmos
...
Adds a couple relief valves
2020-01-18 20:16:30 +01:00
9f2bc48d74
Merge pull request #10600 from Kraseo/ricetriangles
...
Fixes sprinkles on jelly donuts + lack of berry juice
2020-01-18 18:52:14 +01:00
07b3bac674
Merge pull request #10580 from Putnam3145/craft-log
...
Craft logging
2020-01-18 17:47:31 +01:00
29c3e72335
You jelly.
2020-01-18 17:41:31 +01:00
133cb89b32
hilbert's hotel for ghost dojo
2020-01-18 06:55:26 -08:00
6708607073
fixes jelly donuts not having sprinkle sprites, fixes jelly donuts not having berry jelly
2020-01-18 15:05:07 +01:00
81cd277db2
Made metabolic synthesis stop if not fed
2020-01-18 03:47:40 -08:00
95dc861ad8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into player-panel-can-reenter
2020-01-18 03:39:35 -08:00
c612462b8c
some demodularization + new eligibility stuff
2020-01-18 03:39:27 -08:00
3788bc6676
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos
2020-01-17 21:33:13 -08:00
54a2b32f42
Update console.dm
2020-01-17 23:55:44 -05:00
0d3706b7f9
Make public shuttle not require access
2020-01-17 22:15:29 -05:00
2fe23b67db
fug
2020-01-18 03:37:30 +01:00
224146ee1d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit444
2020-01-18 03:36:09 +01:00
fd440ac379
Merge pull request #10592 from Ghommie/Ghommie-cit508
...
Kevinz let some files fall back to CRLF.
2020-01-17 17:34:13 -07:00
da8b29dd23
Merge pull request #10591 from Citadel-Station-13/kevinz000-patch-12
...
Removes blood duplication via virus mix
2020-01-18 01:25:34 +01:00
9c0b78bc09
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-18 01:23:08 +01:00
eaff51ff40
Kevinz let some files fall back to CRLF.
2020-01-17 23:26:05 +01:00
aea0de30d1
Merge pull request #10125 from Ghommie/Ghommie-cit449
...
Ports a few projectile code updates by ke:b:inz.
2020-01-17 15:15:08 -07:00
34872f6969
Merge pull request #10570 from kevinz000/map_network_helpers
...
Power cable + atmos pipe auto mapping helpers
2020-01-17 22:34:38 +01:00
eddb6fda68
Update others.dm
2020-01-17 14:32:51 -07:00
3c2e6a959d
whitespace renormalize
2020-01-17 14:25:29 -07:00
05e2b6a441
Merge pull request #10569 from keronshb/RemoteMoodResearch
...
Ports the Nanite Remote, Nanite Mood Programs + Rebalance, and the Research Generating Nanites
2020-01-17 14:24:13 -07:00
edccfa3523
Update others.dm
2020-01-17 14:15:08 -07:00
e69253bf87
Update others.dm
2020-01-17 14:12:51 -07:00
2b2e694341
Update code/modules/cargo/packs/science.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-01-17 15:56:09 -05:00
300fdb431c
0 clue if itll even work. Cowabunga it is.
2020-01-17 19:46:27 +01:00
72a83f05b5
Merge pull request #10375 from r4d6/radsuit
...
Add a Radiation Hardsuit
2020-01-17 17:36:43 +01:00
e7b925e779
Merge pull request #10582 from Putnam3145/more_flavor
...
Made temp flavor "more" pop up with actual temp flavor
2020-01-17 14:44:04 +01:00
5ace1df9af
better logging, that also works
2020-01-16 19:09:13 -08:00
c1e9618757
Merge pull request #10565 from Citadel-Station-13/revert-10379-tg-47443-shotgunpbs
...
Revert "shotgun pointblanking people actually throws them"
2020-01-16 23:18:37 +01:00
d110d7bae9
Merge pull request #10347 from deathride58/stambufferbuff
...
[experimental] Buffs the stamina buffer by making it recharge for free.
2020-01-16 14:51:38 -07:00
69b5164103
Merge branch 'master' into RemoteMoodResearch
2020-01-16 15:50:11 -05:00
ce16c91b2f
Code changes
2020-01-16 14:08:14 -05:00
ca13be3c92
Merge pull request #10456 from Putnam3145/arousal-bad
...
Removes arousal damage and replaces it with simpler systems
2020-01-16 13:30:31 +01:00
88d6c1a166
OKFINE
2020-01-15 22:02:07 -07:00
327c1e04e0
s
2020-01-15 22:00:08 -07:00
f98f033bb3
Fix linter
2020-01-15 23:57:13 -05:00
r4d6