Commit Graph

2760 Commits

Author SHA1 Message Date
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
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
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
tigercat2000
0dfdc8ae2a Merge pull request #8302 from Kyep/better_service_borgs
Buffs Service Borgs
2017-11-26 12:15:25 -08: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
tigercat2000
612d81a906 Merge pull request #8291 from Anasari/AssumingGender
Stop assuming gender.
2017-11-10 10:15:17 -08: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
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
a523d44c54 Stop assuming gender. 2017-10-22 15:03:55 +08:00
Kyep
246e039ae6 Splits janitor/paranormal gear based on ERT level 2017-10-18 17:36:02 -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
8e6240b13b Merge pull request #8190 from Anasari/NerfMiniSquishFlowToday
Nerf yellow slime cell & Buff ion thruster
2017-10-07 10:56:58 -07:00
tigercat2000
988939aa37 Merge pull request #8169 from uraniummeltdown/whetstone
New Cult Whetstone Sprite
2017-10-07 10:31:26 -07:00
Ansari
ed64971e8a Nerf slime cell charge rate to 500, from 1500 2017-10-03 20:42:21 +08:00
uraniummeltdown
5300b90496 change whetstone notice spans to warning 2017-09-30 22:51:19 +04:00
uraniummeltdown
c067dcf385 new cult whetstone sprite 2017-09-30 22:48:18 +04:00
uraniummeltdown
6b93bf0d1f adds obj sprite, back sprite and inhands for air tanks 2017-09-30 10:05:56 +04:00
tigercat2000
0e44384945 Merge pull request #7465 from Fox-McCloud/peacekeeper-borgs
Adds Peacekeeper borgs; Retains Secborgs
2017-09-27 17:23:16 -07:00
Fox-McCloud
9c3d0a9f8a bleh 2017-09-27 20:06:19 -04:00
Fox-McCloud
70d79e38f1 fixes 2017-09-27 16:01:48 -04:00
uraniummeltdown
fe9fba469b adds the RPD to autolathe and engiborgs, adjusted RPD materials to match the expensive autolathe price 2017-09-25 19:43:54 +04:00
tigercat2000
4f452b2eae Merge pull request #8023 from Birdtalon/defibrilator-shortcut
Control Click shortcut for defibrillator toggle paddles verb
2017-09-24 13:16:50 -07:00
Fox-McCloud
003277a89d Merge remote-tracking branch 'upstream/master' into lungsss 2017-09-17 01:02:33 -04:00
tigercat2000
60e287c019 VV Refactor
Ports /tg/'s VV refactor. Most of this is just cleaning up and making it
easier on the coders, but everyone else benefits too:

 - Mass mod no longer freezes the server (CHECK_TICK <3)
 - Attempting to change any of the step_* values or anything that will
 otherwise disable pixel movement will now prompt you and ask if you are
 sure you want to continue
 - You can actually enter |text| again in a box, rather than being
 forced to always use the multi-line input
 - Cookies! VV saves your search and scroll position for a given UID,
 rather convenient for debugging
 - The refresh button on /clients works finally
 - You can view lists in detail by clicking on them like any other
 reference, and edit them directly that way. This also means there is no
 hard limit on how many variables you can see in a list before it's
 truncated- it will just be hidden until you view the list in VV
 directly.
 - You can shuffle lists and clear duplicate/null entries.
 - Mildly reordered the stuff in the dropdown, inconvenient but
 necessary.
2017-09-14 14:08:38 -07:00
tigercat2000
ab4ca3ae38 Merge pull request #8055 from Kyep/wolono
Nerfs missionary/wololo staff
2017-09-12 20:00:21 -07:00
Birdtalon
4bc42a609d paint bucket fix 2017-09-09 20:12:17 +01:00
Kyep
3a70eb0e31 Removes zealots_made 2017-09-08 16:46:39 -07:00
Kyep
1935856563 Warning on conversion attempt 2017-09-07 12:51:48 -07:00
Kyep
b590800215 Changes nerf. No more damage. Now longer delay / blocked by mindshields 2017-09-07 12:18:53 -07:00
Kyep
c2db663d62 Adds random multiplier 2017-09-07 02:26:18 -07:00
Kyep
e61af42f00 Nerfs missionary staff 2017-09-07 02:06:43 -07:00