tigercat2000
7902c26833
Merge pull request #8359 from uraniummeltdown/airlock
...
Airlock Code Update + Tweaks
2017-12-02 11:33:23 -08:00
tigercat2000
48d78b4648
Merge pull request #7832 from Fox-McCloud/lungsss
...
Breathing is Now Handled on Lungs
2017-12-01 17:51:19 -08:00
uraniummeltdown
3dd6fcc040
moved emagged airlock message to examine()
...
highsec airlocks built with 4 plasteel too
adds science airlocks to metal recipes and RCD
adds hatch and maint hatch to RCD
improve door assembly construction messages
2017-11-29 21:21:20 +04:00
uraniummeltdown
74755d4c60
removed req_amount from stack_recipe_list
2017-11-29 20:09:48 +04:00
Kyep
7b43540403
Tiger requests
2017-11-28 04:44:08 -08:00
Kyep
32bf868e0a
Fox requests
2017-11-27 17:52:48 -08:00
Kyep
5325b1eb21
RSF negative energy fix
2017-11-27 17:43:08 -08:00
tigercat2000
3a759004f6
Merge pull request #8396 from Ty-Omaha/Log
...
Adds plasma ignitions to the atmos investigate logs
2017-11-26 13:04:13 -08:00
tigercat2000
853fe2e73c
Merge pull request #8312 from Kyep/ert_borg_fix
...
Tweaks/Improves ERT borgs
2017-11-26 12:37:55 -08:00
tigercat2000
77810081e7
Merge pull request #8331 from uraniummeltdown/effectfiles
...
Splits effect_system.dm into multiple files and cleans it up, OOP particle effects and effect systems
2017-11-26 12:35:01 -08:00
Kyep
e5db535056
Tiger requests
2017-11-26 12:28:47 -08:00
tigercat2000
0dfdc8ae2a
Merge pull request #8302 from Kyep/better_service_borgs
...
Buffs Service Borgs
2017-11-26 12:15:25 -08:00
Ty-Omaha
9cb754ba57
gets rid of an unneeded (
2017-11-25 12:17:36 -05:00
Ty-Omaha
e96ad102f9
investigate log stuff
2017-11-25 12:03:58 -05:00
Fox-McCloud
6ec234430e
Merge remote-tracking branch 'upstream/master' into lungsss
...
# Conflicts:
# code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
# code/modules/mob/living/carbon/carbon_defines.dm
2017-11-18 18:49:47 -05:00
Kyep
173a9f443d
increase snackfood creation cost to 4k of the 7.5k default cell
2017-11-11 15:51:08 -08:00
uraniummeltdown
de08b914bb
gave door assemblies names
...
added vault door assembly made with 4 plasteel sheets
centcom/ele airlocks have their own assembly
emagged airlock has a different desc
screwdrivering an airlock now displays a message
electronics go into assembly after do_after
2017-11-11 10:13:23 +04:00
tigercat2000
367f0f1ca2
Merge pull request #8155 from FalseIncarnate/windows
...
Windows Update
2017-11-10 22:00:19 -08:00
tigercat2000
612d81a906
Merge pull request #8291 from Anasari/AssumingGender
...
Stop assuming gender.
2017-11-10 10:15:17 -08:00
FalseIncarnate
66f10657bd
fix merge conflicts (again)
2017-11-04 17:37:30 -04:00
uraniummeltdown
7ed2c68ea7
compiles, find and replace particle_effect and effect_system
2017-11-04 20:16:01 +04:00
uraniummeltdown
a0939ca93b
finish making smoke OOP, compiles
2017-11-03 22:46:49 +04:00
uraniummeltdown
4d0ea7b630
add fade out effect to all smoke (untested), move nanofrost smoke to effects_smoke.dm, make smoke effects OOP (unfinished)
2017-11-03 16:48:33 +04:00
Ansari
da924006a6
guess i spaced out during this one
2017-11-02 11:20:37 +08:00
Ansari
c22534dd28
\the
2017-10-30 07:51:29 +08:00
tigercat2000
7ca26db3f3
Merge pull request #8285 from Aurorablade/CultPasBalance
...
Cult Pass split: Balance shit
2017-10-29 11:17:39 -07:00
FalseIncarnate
c1e1dc22d8
merge conflict fix
2017-10-28 18:38:20 -04:00
tigercat2000
a5e4ccdc18
Merge pull request #8103 from FalseIncarnate/reagents
...
Silver Slime Core and Random Reagent changes
2017-10-27 09:23:50 -07:00
Kyep
a53960989a
Tweaks/Improves ERT borgs
2017-10-26 02:45:35 -07:00
Kyep
339bd23af9
Refactor, tofu-turkey=>donut, adds alcohol
...
Refactors to delete copypaste and avoid magic numbers.
Replaces tofu-turkey snack with a donut.
Adds several new reagents, including ice (enables iced tea & coffee,
which have the same stats as normal versions), cream (enables doctor's
delight, a -1 tox/sec fruit drink), cola & soda (enables brown star, a
fruit drink, as well as plain old cola/sodawater), and basic alcohol
reagents tequila/vodka/whiskey (which enable tequilla sunrise,
margarita, bloody mary, screwdriver, 'syndicate bomb', whiskey cola,
whiskey soda).
2017-10-25 18:34:23 -07:00
Crazy Lemon
b31110c0e8
Merge pull request #8270 from Kyep/ert_slots
...
ERT Configuration
2017-10-25 14:55:54 -07:00
Crazy Lemon
217b932606
Merge pull request #8220 from Anasari/BoomChickaWowWoW
...
Add chem reagent logging for grenade priming.
2017-10-25 14:31:09 -07:00
Kyep
0d65cf4d4c
Adds Tofu Turkey & Burker, Chicken Soup & Newdles to RSF.
2017-10-24 16:11:37 -07:00
Crazy Lemon
fcd3ea3194
Merge pull request #8241 from Allfd/fastest-linda
...
Fastest linda
2017-10-22 10:18:52 -07:00
Ansari
dfd1c17768
Change flash pronoun to theirs
2017-10-22 17:05:59 +08:00
Ansari
a523d44c54
Stop assuming gender.
2017-10-22 15:03:55 +08:00
Aurorablade
f1c60a52ba
Balance
2017-10-20 18:44:59 -04:00
Kyep
246e039ae6
Splits janitor/paranormal gear based on ERT level
2017-10-18 17:36:02 -07:00
Kyep
9b7def1f87
Initial version
2017-10-17 23:44:32 -07:00
FalseIncarnate
1a43297db6
merge conflict fix
2017-10-15 21:47:14 -04:00
tigercat2000
b316f484e6
Merge pull request #7609 from Vivalas/splint_nerf
...
Makes surgery great again (nerfs splints)
2017-10-15 14:00:17 -07:00
tigercat2000
b8d6051c66
Merge pull request #7482 from Aurorablade/DreamFluff
...
Phantasmic Dream Fluff:Zekes Tendrils
2017-10-15 13:53:02 -07:00
Alffd
7b67eec6f0
Fastest linda
2017-10-14 23:38:39 -04:00
Ansari
fa3f1ba819
actually make it unembeddable
2017-10-14 13:53:57 +08:00
Ansari
00feecc110
Damnit Imsxz
2017-10-14 13:38:41 +08:00
Ansari
7b4ce9922f
Add logging for chem reagents when nade are primed
2017-10-10 18:52:56 +08:00
Kyep
65d4719835
stops antagbanned players being mindslaved
...
squash
2017-10-09 21:46:38 -07:00
Aurorablade
73b0f32927
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff
2017-10-07 22:46:57 -04:00
tigercat2000
adbb2a9c06
Merge pull request #8168 from scrubmcnoob/Abductor-Megaphone-FIx
...
Abductor Megaphone Fix
2017-10-07 11:25:04 -07:00
tigercat2000
8e6240b13b
Merge pull request #8190 from Anasari/NerfMiniSquishFlowToday
...
Nerf yellow slime cell & Buff ion thruster
2017-10-07 10:56:58 -07:00
