Commit Graph

144 Commits

Author SHA1 Message Date
variableundefined
6b1b38d4f1 Port over tg ore stack and stack merging
Meta

Birbfix

Maxi

Re-add automatic satchel ore pickup (oops)

Mecha formatting

re
2018-10-09 10:06:03 +08:00
Purpose
29c0734905 get area master does nothing! 2018-09-30 17:28:47 +01:00
Fox McCloud
6b8b849c27 Merge pull request #9514 from variableundefined/LightFIXture
Bugfix for card & lightning
2018-09-27 17:15:38 -04:00
variableundefined
b9adf71445 Merge pull request #9550 from SamHPurp/well-defined,-some-would-say-chiseled
Updates use_power to use the Defines
2018-09-27 21:47:04 +08:00
Purpose
037f215d16 updates vars to use the defines 2018-09-16 01:22:57 +01:00
Purpose
de9b01400a remove light fixtures 2018-09-14 22:00:02 +01:00
variableundefined
d46608590f Fixes things 2018-09-10 22:49:46 +08:00
Tayyyyyyy
42f85919de More their 2018-05-25 18:34:26 -07:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
tigercat2000
affc986684 Fix time shit & Add secrets verb 2018-03-26 20:16:22 -07:00
tigercat2000
bc4fb3d79b Nightshifts & Randomized Station Time
This commit adds the Nightshift lighting mode from /tg/. From 19:00 to
07:00 in station time, the station will go into a reduced-lighting mode,
with dimmed lights across the station.

In conjunction with this, there is a new configuration option to start
the shift time at a random time other than 12:00, so that players are
more likely to experience a night shift (as opposed to having to have a
7 hour round).
2018-03-25 23:01:04 -07:00
uraniummeltdown
946ae0d58d moves var/list/armor to /obj level
adds armor to many objects
re-adds the clockcult floor sprite (accidentally removed in another PR)
adds clockcult effects to the clockcult floor
adds clockcult grilles
adds var/broken to /obj/structure
adds unused resistance_flags var
moves burn_state and resistance_flags to flags.dm
more updates to attack code
updated obj_defense.dm procs
2018-03-04 13:52:54 +05: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
tigercat2000
48d78b4648 Merge pull request #7832 from Fox-McCloud/lungsss
Breathing is Now Handled on Lungs
2017-12-01 17:51:19 -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
uraniummeltdown
7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
Sam
18dd833e62 Update lighting.dm 2017-08-17 07:13:40 +01:00
Fox-McCloud
77375fc1c4 Breathing is Now Handled on Lungs 2017-07-19 03:28:21 -04:00
Sam
a0f361efa5 feelin hot hot hot 2017-07-10 02:32:00 +01:00
Sam
7c7c8c70cb Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines 2017-06-10 10:16:33 +01:00
Sam
4d57fff5c9 Updates Intents 2017-06-10 09:43:36 +01:00
HeadyBucket
e7c5f8bf0c Fix infinite glass exploit
Fixes an exploit where glass can be infinitely made. simples.

Also changed a list var and deleted two just because it stuck out for me.
2017-06-06 23:12:50 +01:00
Sam
2d13e2f7bf Converts /modules/ to using WEIGHT_CLASS_x 2017-05-28 01:25:09 +01:00
Crazy Lemon
327f89c890 Merge pull request #6950 from Fox-McCloud/tesla-tweaks
Tesla Update
2017-04-21 09:52:23 -07:00
Fox-McCloud
ee44034138 Tesla Update 2017-03-26 17:53:55 -04:00
Mark van Alphen
cd78336ab8 Merge branch 'master' into findnreplace 2017-03-25 00:11:39 +01:00
uraniummeltdown
0f5c0e40e2 nerf station lighting along with shadowshroom glow power, fix shroom spreading, endurance fix 2017-03-23 14:12:17 +04:00
Mark van Alphen
cef5626f85 Merge branch 'master' into findnreplace 2017-03-09 17:32:42 +01:00
Markolie
3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Markolie
3b73053bc4 Tool fixes 2017-03-06 20:46:24 +01:00
Markolie
6982014a6e Replace all BYOND text macros 2017-02-21 15:41:37 +01:00
FalseIncarnate
8ee22e320a logging changes
as requested by mark
2017-01-25 23:44:27 -05:00
FalseIncarnate
a4037ad426 Rigging Lights and Cells now works with Plasma Dust
Light bulbs, light tubes, and power cells can now be rigged with plasma
dust from grinding plasma sheets as well as the standard plasma reagent
from a chem dispenser. Both reagents require at least 5u of the reagent
to be injected at once to rig the bulb/tube/cell to explode.

If a rigged cell is inserted into a stunprod, it only explodes when you
actually attempt to stun something with it, not when you turn the prod
on. This was unchanged, but I'm mentioning it so people don't think I
changed that.

Fixes #6238

🆑
tweak: Plasma dust can now be used to rig lights and power cells, like
the plasma reagent, with explosive results.
/🆑
2017-01-24 19:47:18 -05:00
TullyBurnalot
f7b729c138 ACTUALLY addresses suggestion by Krausus 2017-01-15 17:37:30 +00:00
TullyBurnalot
86536e3b43 Removes needless proc 2017-01-15 14:35:00 +00:00
TullyBurnalot
d2210f24c5 Re-adds skip_sounds_and_sparks
Woops, forgot how useful this could be
2017-01-15 14:25:05 +00:00
TullyBurnalot
2d82f940f6 Addresses suggestion by Krausus/Syntax fix 2017-01-15 14:20:15 +00:00
TullyBurnalot
c460124da2 Broken-but-On Light fix 2017-01-09 03:25:34 +00:00
Fox-McCloud
62a780220d More Overload Lighting Performance 2016-08-01 15:29:47 -04:00
TheDZD
13d2c6c677 sound lag fixes 2016-08-01 14:10:09 -04:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Tastyfish
41e508e154 Adds suicide_act for light tubes/bulbs 2016-05-27 00:36:10 -04:00
Tigercat2000
954796fec2 Makes the "lightbulbs don't burn you" thing less awful
you can now remove lightbulbs regardless of intent if you are able to
remove them, if you're on disarm or grab you'll burn yourself if you
aren't able to, if you're on help or harm you'll get a message of "too hot
to touch!"
2016-05-05 15:36:11 -07:00
TheDZD
411dbdcf40 Merge pull request #4246 from FlattestGuitar/lightbulbs
Lightbulbs no longer burn you, lighters do a bit less.
2016-04-29 19:44:01 -04:00
Mieszko Jędrzejczak
ef13110610 Permanently dooms everyone and basically kills the universe. 2016-04-27 15:07:30 +02:00
Mieszko Jędrzejczak
6c21db1433 Adds different interactions on different intents 2016-04-27 12:10:48 +02:00
Mieszko Jędrzejczak
36ae2782bb Lighters burn only your hand and lightbulbs don't burn at all 2016-04-20 22:52:48 +02:00
Mieszko Jędrzejczak
5e5a735845 Lightbulbs don't burn anymore. 2016-04-19 20:37:49 +02:00
Fox-McCloud
afddc2d8f1 Fixes+Cleans Up Cold+Heat Resist Mutations 2016-04-15 00:38:44 -04:00