kevinz000 and GitHub
72e2961972
Update PDA.dm
2020-01-18 21:34:24 -07:00
Winter Flare and GitHub
5d4732ed30
Update assistant.dm
2020-01-18 22:36:20 -05:00
Winter Flare
703fe9399a
Some more balance and a fix.
2020-01-18 22:29:21 -05:00
r4d6
2b3f00ed1e
Fix Freezer overlay bug
2020-01-18 22:16:43 -05:00
Winter Flare
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
Putnam
3dc3f28748
Moved cold-blooded to negative, made it cost -2
2020-01-18 18:41:04 -08:00
kevinz000 and GitHub
9619a6bf5d
Update PDA.dm
2020-01-18 19:37:12 -07:00
kevinz000 and GitHub
7b8cb0dbfc
Update PDA.dm
2020-01-18 19:33:22 -07:00
kevinz000 and GitHub
bc18ba314a
Update PDA.dm
2020-01-18 19:21:47 -07:00
Ghom and GitHub
0a5e2cf8ff
Merge pull request #10601 from Putnam3145/dojo-hilbert
...
Adds 16777216 dorms to the ghost dojo
2020-01-19 03:02:32 +01:00
r4d6 and GitHub
1eec1b11dd
Update passive_vent.dm
2020-01-18 20:00:07 -05:00
r4d6
ae5e87d492
Apparently TG has more code than us
2020-01-18 19:12:00 -05:00
r4d6
5084146400
Port
2020-01-18 18:46:22 -05:00
Ghommie
072eca6ec0
fixes and more PRs
2020-01-18 23:01:00 +01:00
Ghommie
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
Ghommie
ca7bdf5f88
clockwork cuirass now compatible with snakes. The original author is very lazy.
2020-01-18 22:06:14 +01:00
r4d6
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
Lin and GitHub
760bbfa8b6
Merge pull request #10571 from Ghommie/Ghommie-cit507
...
Riot foam dart design cost consistency.
2020-01-18 20:46:16 +00:00
Ghom and GitHub
d709edb1c2
Merge pull request #10578 from r4d6/Mining
...
Port TG's Mining changes
2020-01-18 20:32:14 +01:00
Ghom and GitHub
ce2fc37df3
Merge pull request #10501 from Putnam3145/more-atmos
...
Adds a couple relief valves
2020-01-18 20:16:30 +01:00
Ghom and GitHub
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
Ghommie
a2e1c8ecf1
GLOB.
2020-01-18 18:45:20 +01:00
Ghommie
47b031dad2
Update.
2020-01-18 18:40:13 +01:00
Ghommie
82b65f13f4
RPD anti-ventcrawler escapist sanity check.
2020-01-18 18:23:54 +01:00
Ghom and GitHub
07b3bac674
Merge pull request #10580 from Putnam3145/craft-log
...
Craft logging
2020-01-18 17:47:31 +01:00
Ghom and GitHub
c00be1a9b1
Merge pull request #10586 from Tupinambis/RLDNerf
...
Nerfs RLDs because they hard counter nightmares and night ops.
2020-01-18 17:42:30 +01:00
Ghom and GitHub
29c3e72335
You jelly.
2020-01-18 17:41:31 +01:00
Ghom and GitHub
5a613809f5
Merge pull request #10599 from Putnam3145/gibtonite-explosion-fix
...
Fixed gibtonite instantly exploding on pick mining
2020-01-18 16:54:52 +01:00
Putnam
133cb89b32
hilbert's hotel for ghost dojo
2020-01-18 06:55:26 -08:00
Kraseo
6708607073
fixes jelly donuts not having sprinkle sprites, fixes jelly donuts not having berry jelly
2020-01-18 15:05:07 +01:00
Putnam
b30948a60a
Fixed gibtonite instantly exploding on pick mining
2020-01-18 04:37:44 -08:00
Putnam
81cd277db2
Made metabolic synthesis stop if not fed
2020-01-18 03:47:40 -08:00
Putnam
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
Putnam
c612462b8c
some demodularization + new eligibility stuff
2020-01-18 03:39:27 -08:00
Putnam
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
chefferz and GitHub
54a2b32f42
Update console.dm
2020-01-17 23:55:44 -05:00
r4d6
0d3706b7f9
Make public shuttle not require access
2020-01-17 22:15:29 -05:00
Ghommie
2fe23b67db
fug
2020-01-18 03:37:30 +01:00
Ghommie
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
kevinz000 and GitHub
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
Ghom and GitHub
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
Ghommie
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
Ghommie
eaff51ff40
Kevinz let some files fall back to CRLF.
2020-01-17 23:26:05 +01:00
kevinz000 and GitHub
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
Ghom and GitHub
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
kevinz000 and GitHub
eddb6fda68
Update others.dm
2020-01-17 14:32:51 -07:00
kevinz000
3c2e6a959d
whitespace renormalize
2020-01-17 14:25:29 -07:00
kevinz000 and GitHub
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
kevinz000 and GitHub
edccfa3523
Update others.dm
2020-01-17 14:15:08 -07:00
kevinz000 and GitHub
e69253bf87
Update others.dm
2020-01-17 14:12:51 -07:00