Commit Graph

1064 Commits

Author SHA1 Message Date
Crazylemon64
7b4dd7eb19 Cleans out various macro redefinitions or useless use of syntax 2018-07-30 23:24:35 -07:00
Crazy Lemon
25d0bce893 Merge pull request #8307 from Allfd/supermatter
Update SM
2018-07-11 12:37:20 -07:00
Fox McCloud
27ebe7a6fe Standardized Robotic Organ Checking--Removes Mechassited Organs 2018-07-07 21:33:42 -04:00
Alffd
12c62e36f9 Alert changes 2018-06-22 23:03:18 -04:00
Alffd
a081befbc2 Fox helped me fix. 2018-06-21 21:24:18 -04:00
Alffd
8a6a33bd4b Fix non-existant icon status and tablet icon offsets 2018-06-21 19:04:55 -04:00
Alffd
cdbc5dae98 Fixes for crazy 2018-06-21 19:04:55 -04:00
Alffd
5da3c756fd I am sure it will be fine 2018-06-21 19:04:55 -04:00
Alffd
d16f1a71f6 Space changes 2018-06-21 19:04:55 -04:00
Alffd
23988e92dc Add rad alarm 2018-06-21 19:04:55 -04:00
Alffd
acf2375980 Check ambition, port updates. 2018-06-21 19:04:55 -04:00
Alffd
eac81af1ca Initial update of SM code 2018-06-21 19:04:55 -04:00
MINIMAN10000
06cfcd156d Better method of deffered processing 2018-06-18 12:10:16 -07:00
MINIMAN10000
8bbce44c49 Fix emitters 2018-06-13 22:40:38 -07:00
Kyep
412341439a Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)
* Fixes #8954

* projectile reagetns

* removes all attack logs on keyless simple_animals even by keyed mobs

* deletes 'potentially'

* Tiger request

* more comprehensive solution

* check for mob

* istype

* brevity

* Split attack logs preference

* toggle

* deletes old CHAT_ATTACKLOGS

* explains what levels do when toggling them

* clarification

* Tigercat requests
2018-06-13 16:55:21 -07:00
tigercat2000
41ef6f0ed0 Merge pull request #9098 from RyanSmake/nar_she
Ports TG's Nar'Sie
2018-06-07 17:02:55 -07:00
Bxil
a1f540f238 Ports TG's Nar'Sie 2018-06-06 18:48:16 +02:00
tigercat2000
5ace5944d9 Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings 2018-05-31 19:34:47 -07:00
Tayyyyyyy
f00d350596 Fix powercell 2018-05-25 18:39:38 -07:00
Tayyyyyyy
bc977804de Small fixes 2018-05-25 18:39:38 -07:00
Tayyyyyyy
919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Tayyyyyyy
42f85919de More their 2018-05-25 18:34:26 -07:00
tigercat2000
254cdd6055 Merge pull request #8972 from Fox-McCloud/power-cell
Power Cell Code Cleanup
2018-05-09 11:26:03 -07:00
Fox McCloud
8bd042240f Power Cell Code Cleanup 2018-05-02 19:35:18 -04:00
tigercat2000
7fb8f8d76c Merge remote-tracking branch 'upstream/master' into more_ss_ports
# Conflicts:
#	paradise.dme
2018-04-30 09:27:11 -07:00
tigercat2000
7d8c9a731a SS Conversion: Atoms, Machines, n' Mobs
This converts the machine and mob processes to the SMC. Additionally, it
adds the Atom subsystem, which handles all Initialize() calls in place
of the old gameticker. Due to incompatibility with our atmospherics
(FUCK OUR ATMOSPHERICS FOR FUCKING EVER JESUS CHRIST WHO THE FUCK MADE
THIS PIECE OF GODDAMN SHIT) atmospherics machines do not use
Initialize() as they should, instead opting for a custom atmos_init
proc that the air controller handles.
2018-04-28 17:55:15 -07:00
Fox McCloud
cfe182a1f7 Ports over Timer Subsystem 2018-04-28 20:26:04 -04:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
tigercat2000
c03621c508 Completely Overhaul Logging
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
2018-04-19 15:07:59 -08:00
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