Commit Graph

6807 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
tigercat2000
e69f931b78 Merge pull request #8405 from uraniummeltdown/smooth
Diagonal Icon Smoothing
2017-11-30 11:18:02 -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
uraniummeltdown
e3f8960df6 small icon smoothing optimization
icon states for false walls
2017-11-29 10:17:49 +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
da1dcab8ea Fixes Picking Up Items 2017-11-22 19:38:52 -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
uraniummeltdown
b545359618 reordered vars, removed var/ and "as mob/obj" in proc args, removed src., removed unnecessary spacing, added ishelpers, removed unnecessary .0 2017-11-09 20:22:38 +04:00
uraniummeltdown
bca7b3602c renames assembly_type to assemblytype for parity with tg
moved a few door and airlock procs around to more sensible positions
removed useless vars on some airlocks in airlock_types.dm
lowercased all airlock/door objects
2017-11-09 15:23:15 +04:00
FalseIncarnate
49c65da656 Shuttle window health reduction 2017-11-07 21:20:09 -05:00
FalseIncarnate
6a941a8526 Message and spacing tweaks 2017-11-04 18:13:39 -04:00
FalseIncarnate
66f10657bd fix merge conflicts (again) 2017-11-04 17:37:30 -04:00
uraniummeltdown
2fd7d2e32f finishing touches, particle effects pass tables and grilles 2017-11-04 23:36:36 +04:00
uraniummeltdown
7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
uraniummeltdown
5c4f4ec5e5 effect/system to effect_system
effect/effect to effect/particle_effect
make foam an effect again
move explosion_particles.dm to effect_system folder
OOP effect code, addtimers, QDEL_IN
fixed reagent explosions never having a flash range due to a typo
2017-11-04 18:21:51 +04:00
uraniummeltdown
f414d5065d /obj/effect information 2017-11-04 16:19:54 +04:00
uraniummeltdown
1bea7973bd -removed coughedtime from mob_defines.dm and added smoke_delay to living_defines.dm
-fading out smoke finally works
-removed the spawns in smoke code it now uses process()
-sleeping smoke uses Sleeping() instead of AdjustSleeping()
2017-11-04 15:21:26 +04:00
uraniummeltdown
718aaf4d87 removes the useless effect/delete() proc, used QDEL_IN and addtimers, nanofrost can weld scrubbers too, some more cleanup fixes and tried to get smoke fade_out to work (it doesn't work and hasn't in the past) 2017-11-04 12:06:35 +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
uraniummeltdown
e1f5b6aa07 removed mustard gas smoke as it's not used anywhere 2017-11-01 20:27:32 +04:00
uraniummeltdown
4814e3e3d7 removed excessive spacing, removed var/ in proc args, used some ishelpers, absolute pathing for everything 2017-11-01 15:56:13 +04:00
uraniummeltdown
9e71ddd208 splits effect_system.dm into multiple files 2017-10-31 20:27:45 +04: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
tigercat2000
13edd0a91d Merge pull request #8288 from FreeStylaLT/paramedics_anti_theft_movement
Moves Paramedic's key from his clothes-locker to his EVA locker, removes an extraneous helmet from Paramedic's EVA locker
2017-10-26 15:32:53 -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
FreeStylaLT
9bb03159f0 removes the extraneous helmet 2017-10-25 14:29:32 +09:00
Kyep
0d65cf4d4c Adds Tofu Turkey & Burker, Chicken Soup & Newdles to RSF. 2017-10-24 16:11:37 -07:00