Fox McCloud
2b25584372
Merge remote-tracking branch 'upstream/master' into remove-weapons
2018-04-19 17:01:38 -04:00
MINIMAN10000
ad53317db1
Merge Conflict Resolved
2018-04-17 11:24:50 -07:00
tigercat2000
a9f4022fa8
Merge pull request #8874 from MINIMAN10000/cable-coil
...
Cable coils can transfer part of a stack
2018-04-16 18:12:14 -07:00
Fox McCloud
5c4aa9b3fd
Removes All Weapons
2018-04-15 16:25:56 -04:00
MINIMAN10000
f023edefa7
Crayons color cables, cableColor now cable_color
2018-04-14 23:54:37 -07:00
Fox McCloud
129e1f66f7
GC radio stuffs
2018-04-14 13:44:26 -04:00
MINIMAN10000
5d52f60d9d
Comment about where merging is handled, moved to_transfer variable to immediately above where it is used
2018-04-13 18:27:20 -07:00
MINIMAN10000
e875af3d56
Cable Coils can partial transfer, stripped depereciated code, changed cable coil message
2018-04-13 16:48:14 -07:00
Fox McCloud
1d80bf01c0
Merge remote-tracking branch 'upstream/master' into gc-ss-port
...
# Conflicts:
# paradise.dme
2018-04-03 18:21:04 -04:00
tigercat2000
e71c4279a7
Merge remote-tracking branch 'upstream/master' into night_shift
...
# Conflicts:
# paradise.dme
2018-03-30 10:20:21 -07:00
Fox McCloud
7f842e3223
no more runtimes
2018-03-29 00:44:53 -04:00
Fox McCloud
22dc6860b3
Ports TG's Garbage Subsystem
2018-03-28 20:02:39 -04:00
Fox McCloud
5701ea7c75
Ports Nano UI to Subsystems
2018-03-26 23:59:52 -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
Fox McCloud
2b6a6eb812
Ports Sun Controller to Subsystem
2018-03-25 19:23:26 -04:00
tigercat2000
b1278de3d2
Merge pull request #8674 from uraniummeltdown/attacks
...
[READY] Attack Code Update
2018-03-22 11:55:53 -07:00
Tad Hardesty
1ca410b91e
Fix various syntactic problems
2018-03-06 23:19:39 -08:00
Funce
27d3ccbe10
Allow silicons to properly use interface lock UI.
2018-03-05 11:48:40 +13: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
369c654c70
moves material defines to construction.dm
...
adds the titanium mineral, titanium [false]walls, titanium floors, titanium airlocks
adds plastitanium, plastitanium [false]walls, plastitanium floor
made survival pod wall a subtype of titanium wall
changes a few rnd recipes to use titanium
small refactor of ORM code, smelt titanium+plasma to plastitanium
shuttle windows have explosion block 3
2018-02-06 01:24:36 +05:00
tigercat2000
ce18ecdbbf
Merge pull request #8543 from IK3I/I-SAID-CANCEL!
...
Some Fixes and Usability Stuff
2018-01-24 15:41:36 -08:00
uraniummeltdown
8fd3a5e890
move cult effects to their own file
...
move cult beams to beam.dmi
2018-01-16 23:38:36 +05:00
IK3I
d57622b460
NARSIE SAYS LEAVE!
...
* Shuttles now properly respect the intentions of eldritch horrors
* Comms consoles will tell you when the shuttle can't be recalled
instead of just saying nope
* Admemes can now designate if their shuttles are recallable when they
call them
2018-01-11 11:41:04 -06: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
uraniummeltdown
a0939ca93b
finish making smoke OOP, compiles
2017-11-03 22:46:49 +04:00
uraniummeltdown
bca9b79374
new pacman portable generator sprites
2017-09-30 12:15:11 +04:00
tigercat2000
bf3f968c6f
Merge pull request #7747 from SamHPurp/ouch-hot-hot-hot
...
Halts another macro suicide method
2017-09-24 18:48:52 -07:00
Xsingular
88c6cb23ff
Fixed efficiency math in Turbine.dm
...
Fixed the RPM equation in the Compressor part of Turbine.
2017-09-24 01:55:29 +02:00
Sam
18dd833e62
Update lighting.dm
2017-08-17 07:13:40 +01:00
Fox-McCloud
9d14e6c9da
Merge remote-tracking branch 'upstream/master' into lungsss
...
# Conflicts:
# code/modules/mob/living/carbon/alien/humanoid/life.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/station.dm
# code/modules/surgery/surgery.dm
2017-08-05 19:03:52 -04:00
Fox-McCloud
c3ed8de770
faster
2017-08-04 17:15:47 -04:00
Fox-McCloud
2f87d0f55a
Reduces Tesla Cost
2017-08-03 19:37:10 -04:00
Fox-McCloud
6bd0d17527
performance
2017-07-31 14:01:15 -04:00
Fox-McCloud
027e7619f5
Removes All Comments about auto-correction and Finddeclaration.exe
2017-07-22 02:54:45 -04:00
Fox-McCloud
77375fc1c4
Breathing is Now Handled on Lungs
2017-07-19 03:28:21 -04:00
Crazylemon64
8993e05a0b
Fixes easy cable laying
2017-07-16 16:44:46 -07: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
7cf499dcc1
Adds movement intents
2017-06-10 10:12:14 +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
tigercat2000
633c972f46
RnD autolathe removal + tech level overhaul
2017-06-01 11:34:29 -07:00
Sam
2d13e2f7bf
Converts /modules/ to using WEIGHT_CLASS_x
2017-05-28 01:25:09 +01:00
Fox-McCloud
31c9519f3e
More GC Define Transitions
2017-05-13 04:24:05 -04:00
Crazylemon64
1840074921
Refactors "organs" to be "bodyparts" to end confusion once and for all
2017-04-29 23:23:09 -07:00
Crazy Lemon
327f89c890
Merge pull request #6950 from Fox-McCloud/tesla-tweaks
...
Tesla Update
2017-04-21 09:52:23 -07:00
