cf9d3977b8
Reward Fix
2020-01-19 15:25:20 -05:00
703fe9399a
Some more balance and a fix.
2020-01-18 22:29:21 -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
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
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
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
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
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
de4e65c467
Savefile conversion for inesct
2020-01-15 20:13:09 -08:00
512b112154
happythink
2020-01-15 20:45:05 -07:00
ab0c1f3f59
oh it's a list
2020-01-15 19:36:20 -07:00
4f665930cc
a a
2020-01-15 19:32:38 -07:00
7d9f4f9fe5
Merge pull request #10417 from kevinz000/nightshift_1
...
Nightshift improvements: public area settings/levels, nightshift auth requirement change, config changes, etc etc
2020-01-16 03:21:49 +01:00
70c1b0635a
early returns.
2020-01-16 03:14:39 +01:00
b42de8d457
compile
2020-01-15 18:49:29 -07:00
c710c332e4
compile
2020-01-15 18:37:09 -07:00
e8d8d32a33
ree
2020-01-15 18:34:16 -07:00
90be124730
Merge remote-tracking branch 'citadel/master' into map_network_helpers
2020-01-15 18:30:14 -07:00
2a4e2204c5
no definemania then..
2020-01-15 18:29:45 -07:00
8f7460ff96
definemania
2020-01-15 18:24:13 -07:00
c5b95ff5d0
Mapping helpers
2020-01-15 18:22:43 -07:00
554f23e790
aight bet
2020-01-15 18:04:05 -07:00
872628d9aa
Apply suggestions from code review
...
thank you gamer
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-01-15 18:02:23 -07:00
d29603ad77
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
2020-01-15 15:57:32 -08:00
f7791c3db7
Hopefully help travis
2020-01-15 17:27:09 -05:00
e685c3fc09
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit
2020-01-15 17:15:21 -05:00
4b090f938c
ok
2020-01-15 20:51:36 +01:00
7b34daae48
Merge pull request #10563 from Trilbyspaceclone/patch-268
...
Makes fragile suit less likely to brake from toys
2020-01-15 15:51:15 +01:00
5eb26682e2
Merge pull request #10557 from timothyteakettle/timothyteakettle-gene-modder-1
...
remove trait genes without disks
2020-01-15 14:54:11 +01:00
b0c2e4cbdd
Revert "shotgun pointblanking people actually throws them"
2020-01-15 01:13:26 -07:00
7b322ff467
Merge branch 'master' into greytide-standard-uniform
2020-01-14 19:39:16 -06:00
5351bc9f8a
Update miscellaneous.dm
2020-01-14 19:15:35 -05:00
8a06f2f45c
Merge pull request #10499 from Hatterhat/tg-40046
...
more /tg/station ports - tools! logging! some other fun stuff!
2020-01-15 01:05:36 +01:00
5dee355381
Merge pull request #10530 from kappa-sama/modularer
...
deletes modular items but this time i don't get cucked
2020-01-15 00:47:38 +01:00
26d6e7f05c
Work.
2020-01-14 22:04:38 +01:00
3984943b0d
[s] makes master compile.
2020-01-14 20:02:26 +01:00
03ebab6ec5
Merge pull request #10454 from Commandersand/clothsfix
...
fixes clothing directional sprites(i swear not all of them are my fault)
2020-01-14 18:24:50 +01:00
Winter Flare