c39dd52b5f
Merge remote-tracking branch 'citadel/master' into eldritch_affairs
2020-03-27 21:32:40 -07:00
c0029612a3
SO YOU DON'T HAVE HORRIBLE MATH PROBLEMS
2020-03-25 08:53:30 +11:00
3c548a3819
YES OFFICER I DO HAVE A DEADLY WEAPON THESE HANDS
2020-03-25 08:33:23 +11:00
b789cd246a
frying changes with bad chems ( #11580 )
...
* Update toxin_reagents.dm
* Update snacks_bread.dm
* Update toxin_reagents.dm
2020-03-24 20:03:49 +01:00
f8147e5a85
Ports over Mortars and Pestles ( #11546 )
...
* 2 ports for the commit of 1!
ports -[ready]ghetto grinder
#43600
ports - Mortar and Pestle Fixes #48086
Links -
https://github.com/tgstation/tgstation/pull/43600
https://github.com/tgstation/tgstation/pull/48086
* what if we didnt have that...
* Apply suggestions from code review
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-24 14:03:31 +01:00
ea7c1058b5
Merge pull request #11524 from Ghommie/Ghommie-cit627
...
More or less ports "Clothing /under repath"
2020-03-23 10:40:31 -07:00
cc80d463b7
Merge pull request #11536 from Trilbyspaceclone/patch-316
...
Water and Unholy water tweaks
2020-03-23 10:40:19 -07:00
fbe77495e8
Merge pull request #11576 from Owai-Seek/strawberryjuice3-21-2020
...
Porting Juices, Drinks, and Salami [READY]
2020-03-23 10:36:44 -07:00
0effeb6ed5
Ports Hyper Drinks
...
Ports Drinks from Hyper
https://github.com/quotefox/Hyper-Station-13/pull/121
https://github.com/quotefox/Hyper-Station-13/pull/192
2020-03-22 19:33:50 -04:00
cd3f8f5df5
Porting More Stuff
...
Ports Moana Lou
https://github.com/tgstation/tgstation/pull/46539
Ports Moscow Mule, Sol Dry
https://github.com/tgstation/tgstation/pull/48466
Ports Hivemind Eraser
https://github.com/tgstation/tgstation/pull/49325
2020-03-22 15:13:00 -04:00
5c3037b5d0
Fixed Several Foods, Strawberry Juice
...
Add Strawberry Juice
Port Salami
https://github.com/tgstation/tgstation/pull/48817
https://github.com/tgstation/tgstation/pull/49228
Ports some TG Drinks
https://github.com/tgstation/tgstation/pull/48783
Made lizards like:
Egg Wrap
Tweaked Soda Dispenser
Moved Egg Wraps
Tweaked Strawberry Tea and Strawberry Milk recipies.
2020-03-22 00:19:28 -04:00
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
7c94b555ae
Kills screen-wide EMPs ( #11375 )
...
* Kills screen-wide EMPs
This makes a small line change to make the EMP reaction's size be determined logarithmically, rather than linearly. That meaning, there's diminishing returns on EMPs. As a consequence, there's not TOO much reason to try to make a very big EMP, like with maxcaps (before toxins became research, anyway), though I'm sure some of you, who like to get the largest numbers on things possible, can still reach some ungodly numbers with payloads. You're welcome to reach for new heights, but you shouldn't be able to lolEMP the entire station.
* EMP shrinking 2
2020-03-21 16:09:24 +01:00
f58bad79ec
Update other_reagents.dm
2020-03-21 02:18:57 -04:00
8b0600a7fa
Merge pull request #11527 from Ghommie/Ghommie-cit628
...
More bug reports yee'd their last haw.
2020-03-19 18:56:32 -07:00
d499db2fe4
Update other_reagents.dm
2020-03-19 16:58:45 -04:00
a0294698c0
extra runtime fixes, also porting tgstation#49997
2020-03-19 04:49:01 +01:00
1649f42570
bruh
2020-03-18 01:24:54 +00:00
a24a67e489
Update reagent_containers.dm
2020-03-16 17:07:30 +01:00
d47c24a8d0
Fixing right click / verb set_APTFT
2020-03-16 16:44:15 +01:00
888f67c4bc
Update borghydro.dm
2020-03-13 18:21:12 -04:00
78aa46d8de
Merge pull request #11416 from Trilbyspaceclone/patch-306
...
Makes Bluespace and Urianium reagents be able to be turned into sheets
2020-03-12 09:49:26 -07:00
b4f57a8885
Update others.dm
2020-03-12 10:56:25 -04:00
442eb13e75
Merge pull request #11425 from Citadel-Station-13/kevinz000-patch-3
...
fixes synthflesh/rezadone dehusk threshold check
2020-03-12 14:20:49 +01:00
69c21f4b76
Merge pull request #10327 from Seris02/tggenetics
...
ports tg genetics
2020-03-11 17:01:37 -07:00
9f681e9a76
Merge pull request #11409 from necromanceranne/taser_nerf
...
Particle Defender no longer just the HoS taser but a shotgun/Stimulants protect against the tased effect.
2020-03-12 00:30:52 +01:00
bb45117c92
Update medicine_reagents.dm
2020-03-10 23:37:14 -07:00
ce8de536b5
Merge remote-tracking branch 'citadel/master' into eldritch_affairs
2020-03-10 17:24:09 -07:00
833841bd7b
Update others.dm
2020-03-10 16:48:33 -04:00
bd4e32e1c4
Update others.dm
2020-03-10 16:35:04 -04:00
e210f7d535
Merge pull request #11391 from Ghommie/Ghommie-cit612
...
Porting "Further update_icon splitup"
2020-03-10 05:58:17 -07:00
bfb75eb26b
Merge pull request #11396 from Ghommie/Ghommie-cit613
...
Ports "Switches out the three billion args of electrocute act for flags"
2020-03-10 05:56:28 -07:00
e0df350579
PD now isn't a HoS taser x3 and has reasonable damage, stimulants actually combat the taser effect instead of you just being completely fucked by the HoS even through adrenals.
2020-03-10 23:21:59 +11:00
cccd0e9eef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-03-09 16:49:32 +08:00
ee1eea8874
Ports "Switches out the three billion args of electrocute act for flags"
2020-03-09 04:01:23 +01:00
59b1a223a3
Ok, done.
2020-03-08 22:51:36 +01:00
0f14fbfdac
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor
...
To fixs something?
2020-03-08 17:51:17 -04:00
64215b41a4
Merge pull request #11363 from Ragolution/took-it-and-threw-it-on-the-ground
...
Culls irrelevant targeting information on Drink Fling.
2020-03-08 01:39:41 +01:00
9d1cef2e97
Update code/modules/reagents/reagent_containers.dm
...
Drink slide changes recommended by Ghom p.2
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-07 01:58:17 -05:00
860d6b0827
Update code/modules/reagents/reagent_containers.dm
...
Drink slide changes recommended by Ghom p.1
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-07 01:58:06 -05:00
228012c718
Blob refactor ( #43872 )
...
Ports over Blob Refactor from TG
2020-03-06 15:58:17 -05:00
1cc7d01a44
Culls irrelevant targeting information.
2020-03-06 11:39:27 -05:00
4857bd120c
Fixes bartender drink slide spill
...
Forces drink throw call to check for bartender throwing before spilling contents. Feels like a lazy fix, but it works.
2020-03-06 10:06:59 -05:00
f24c7fb142
Merge pull request #11222 from Trilbyspaceclone/ashwalkers
...
Ashwalkers now can make a well, got their livestock back and more!
2020-03-06 13:48:03 +01:00
b80acdfaa6
Update glass.dm
2020-03-06 05:39:18 +01:00
2e35c09dec
Merge pull request #10451 from kevinz000/mobility_flags
...
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
f879316b4e
All it lacked is a return.
2020-03-04 23:29:08 +02:00
6354b48659
fix
2020-03-03 20:58:06 -07:00
0b5481f9b9
Merge pull request #11237 from kevinz000/reagent_logging_3
...
reagent logging pr attempt 3 but it works
2020-03-03 21:27:17 +01:00
1e99cd0bfe
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
kevinz000