Commit Graph

4234 Commits

Author SHA1 Message Date
tigercat2000
d8a00048bd Merge pull request #8424 from uraniummeltdown/airlockoverlay
Airlock Overlays + Tweaks
2018-02-01 08:19:24 -08:00
Tayyyyyyy
460cada461 Add light to flashbangs 2018-01-23 15:32:04 -06:00
uraniummeltdown
4730376381 move door_assembly types to new door_assembly_types.dm
fixed some redundant varedits
made glass airlocks a subtype of their solid variant
examine door assembly to see name set with pen
2018-01-22 21:54:11 +05:00
uraniummeltdown
9312f1fb7d airlock assembly states have defines, removed redundant door layer defines
added abductor airlocks from /tg/
station2 airlocks have a solid version, added external maintenance airlocks
added airlocks to RCD
survival pod airlocks have a solid version
door assemblies have examine hints, give more feedback, use overlays, mineral assemblies can have glass installed, use deconstruct() proc
multi tile airlocks have a solid version
moved airlock-specific procs to airlock_types.dm
airlocks use overlays now
airlocks use deconstruct() proc
map edits done to ensure nothing changes
some old airlock icons kept in due to use as /door/unpowered by away missions
airlocks open faster, delays between frames of icon states halved
added isshade() and isconstruct() helpers
cult airlocks will show their overlay
fixes plasteel material amount
2018-01-22 20:27:34 +05:00
tigercat2000
696136b579 Merge pull request #8565 from uraniummeltdown/repathvisual
effect/temp_visual update
2018-01-20 11:25:08 -08:00
tigercat2000
4830015bc4 Merge pull request #8550 from uraniummeltdown/tables
Table Construction Overhaul
2018-01-18 22:12:57 -08:00
uraniummeltdown
900bfd5e3b adds ratvar_act() and adds ratvar_act()'s for a few things
adds brass, clockwork floor, brass tables and table frames
2018-01-18 18:28:41 +05:00
uraniummeltdown
c89b1e8463 repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2018-01-18 13:03:49 +05:00
uraniummeltdown
9c90c817b6 adds missing lavastaff and guardian phase effect icons
kills off anim() proc, removes ninja rigsuit electricity effect
gets rid of the flick() in temporary_visual.dm because pooling is dead
updates ethereal_jaunt.dm and makes it OOP, wraiths no longer show the wizard animation, jaunters cannot move after duration is over, fixes directions errors
turns many anim() into obj/effect/overlay/temp
smoother pet heart animation
2018-01-18 12:56:18 +05:00
Citinited
6b765b4ad0 Removed spaces from span class = '' 2018-01-13 17:47:08 +00:00
uraniummeltdown
7f4c9263ce removes table parts, adds table frames
table/woodentable -> table/wood
tables are built by applying stacks to table frames
altered table construction
cleaned the code and increased obj_integrity of some tables and racks
lowercased 'carpet'
2018-01-12 23:22:55 +05:00
Citinited
ad4c8b3178 Cooldown on syndicate balloon 2018-01-12 16:13:11 +00:00
Citinited
d93351eda9 You can now play with the syndicate balloon 2018-01-11 21:58:06 +00:00
Crazy Lemon
2da9316b4e Merge pull request #8226 from Anasari/GarroteBehindYouNuffinPersonnel
Nuke Op items discount & rebalance
2018-01-04 14:51:28 -08:00
tigercat2000
c1c4b08807 Merge pull request #8476 from uraniummeltdown/decon
deconstruct() at obj level + other changes
2018-01-02 10:28:17 -08:00
tigercat2000
9241a2ed1e Merge pull request #8494 from SkullyRoberts/AppeaseARC
Remove the Red Cross from the last of the medical sprites
2018-01-01 12:24:37 -08:00
tigercat2000
be9e258fd9 Merge pull request #8468 from Aurorablade/SaltInTheEyes
Decouples Darksight from Colorblind
2017-12-31 06:33:49 -08:00
uraniummeltdown
75e177b7a9 renames receive_damage() for animations to receiving_damage()
renames take_damage() for organs to receive_damage()
renames Deconstruct() to deconstruct() for atmos objects
obj_integrity, max_integrity, integrity_failure vars moved to /obj level, obj_integrity = max_integrity on New()
2017-12-28 00:32:54 +05:00
SkullyRoberts
583af44187 Removed incorrect header discriptions
Someone's gotta comment this stuff properly.
2017-12-13 17:58:33 -05:00
Crazy Lemon
c02a561a5a Merge pull request #8283 from Kyep/no_peace
Removes peacekeepers
2017-12-05 15:12:56 -08:00
Aurorablade
203e998640 oh god here we go 2017-12-03 23:03:56 -05:00
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
1c3b1957cb Fixes merge conflict 2017-11-28 22:39:01 -08: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