Commit Graph

816 Commits

Author SHA1 Message Date
Mars
f2532e74ba Merge conflict fix 2018-08-28 11:28:13 +02:00
Mars
b5b09b435c No hard-coded format in the macros anymore 2018-08-16 11:51:52 +02:00
Mars
e8d92b3ced More flexible macro 2018-08-16 11:37:03 +02:00
Kyep
c1c98e46ef failure messages, depot outgoing redspace portal 2018-08-16 00:57:59 -07:00
Mars
4d3c3b29e4 Quick Regex replace action
Used Regex to replace all hrefs with \ref and the same displayed text
with the corresponding UID macros
2018-08-15 23:57:46 +02:00
Kyep
477912dc72 CrazyLemon 2, more small stuff 2018-08-06 21:19:10 -07:00
Kyep
62b7f6b55b split jaunter change also 2018-08-02 09:39:00 -07:00
Kyep
102ff67095 fixes merge conflict 2018-08-01 04:13:22 -07:00
Kyep
7a493a5151 neca-inspired loot list adjustments 2018-07-31 17:48:02 -07:00
Crazylemon64
b2d0bb1c0b Fixes maploading so that the cyberiad and space hotel load cleanly again 2018-07-24 20:58:38 -07:00
Fox McCloud
7440dad57e further conversion 2018-07-18 01:13:24 -04:00
Fox McCloud
aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -04:00
Kyep
3fb7a5e526 Merge remote-tracking branch 'ParadiseSS13/master' into depot 2018-06-28 18:02:48 -07:00
Kyep
4308d658f3 a bunch of fixes & tweaks
jaunters no longer let you escape depot, sentry bot can now be deactivated (for alert increase, via ai console), sentry bot no longer alerts when it get stuck - but does log to debug log, calling red alert with comms console depowered no longer spawns backup, armory door sprites improved, syndi depot beacon never enabled during nukeops, loot table tweaks, removed DM spawner custom icons
2018-06-27 11:34:28 -07:00
Shanewayne9
b6c5c9d3cf coin string fix
from #9106
2018-06-17 18:14:52 -07:00
Fox McCloud
5fb13096a2 Merge remote-tracking branch 'upstream/master' into weather-subsystem
# Conflicts:
#	code/__DEFINES/layers.dm
2018-06-13 16:56:19 -04:00
uraniummeltdown
75bded82cf added defines for window construction states and full window diagonal dir
added a proc to check for valid window location, added var/fulltile to windows instead of using a proc
added clockwork windoors and windows to brass recipes
added titanium glass and plastitanium glass, made glass types use recipes like other stacks, you can smelt the new glasses in the ORM
removed force from RCD and added NOBLUDGEON flag, fixing a bug where you couldn't deconstruct airlocks with an RCD
slight nerf to wielded fireaxe, does high damage to windows and grilles instead of insta-deleting them
deleted fullwindow.dm and moved windows to window.dm
added some feedback to placing glass on grilles
examining windoor assembly shows you can rotate it, examining windows show deconstruction hints and rotation
added cracks to windows, you can repair windows using a welding tool on help intent, slight buff to window health
added var/cancolor to windows and blacklists some windows from being auto-colored, window shards also get colored on narsie_act()
full windows now use icon smoothing system, windows now use the obj_integrity damage system
added is_glass_sheet() helper
2018-06-03 13:11:37 +04:00
Tayyyyyyy
bc977804de Small fixes 2018-05-25 18:39:38 -07:00
Tayyyyyyy
aa9d658847 Them 2018-05-25 18:34:28 -07:00
Tayyyyyyy
42f85919de More their 2018-05-25 18:34:26 -07:00
Fox McCloud
6cdfe70303 Converts and Updates Weather Subsystem 2018-05-21 00:01:18 -04:00
Fox McCloud
f28285e16f further checks 2018-04-30 04:42:57 -04:00
Fox McCloud
cfe182a1f7 Ports over Timer Subsystem 2018-04-28 20:26:04 -04:00
Crazy Lemon
608a4531ff Merge pull request #8924 from Fox-McCloud/ORM-refactor
ORM Refactor
2018-04-26 14:55: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
fa683dd3c1 ORM Refactor 2018-04-25 14:26:51 -04:00
Fox McCloud
a58c2a8693 smelter to components 2018-04-23 19:56:27 -04:00
Fox McCloud
a431b92c61 forgot this 2018-04-23 15:47:49 -04:00
Fox McCloud
7c8299d443 mint machine 2018-04-23 15:44:29 -04:00
Fox McCloud
eafd57487c Merge remote-tracking branch 'upstream/master' into component-port
# Conflicts:
#	paradise.dme
2018-04-23 13:54:50 -04:00
Fox McCloud
0382afcb33 Ports TG Components 2018-04-21 01:22:50 -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
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04: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
Fox McCloud
22dc6860b3 Ports TG's Garbage Subsystem 2018-03-28 20:02:39 -04: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
8f26d5b8b6 rename __DEFINES/mob.dm to __DEFINES/mobs.dm
make environment_smash into bitflags
add obj_damage for simple animals
make default max_integrity and obj_integrity INFINITY for non-defined objects, until we can move more objects to obj_integrity/take_damage() system
adds examining objects to roughly check damage
more obj_defense.dm procs
tables can be attacked with items, glass tables have a narsie_act()
fixes, changes to make it compile
2018-03-04 13:52:55 +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
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
uraniummeltdown
c89b1e8463 repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2018-01-18 13:03:49 +05: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
8678ae6a69 Fixes jaunters working on non-teleport-allowed levels and vice-versa 2018-01-10 15:20:57 +00:00
uraniummeltdown
73d7af2675 moves var/can_deconstruct to obj level
moves proc/deconstruct() and proc/take_damage() to obj level, moves a few obj damage procs in with it to new obj_defense.dm
moves plastic flaps to new plasticflaps.dm
2017-12-26 18:16:42 +05:00
tigercat2000
7902c26833 Merge pull request #8359 from uraniummeltdown/airlock
Airlock Code Update + Tweaks
2017-12-02 11:33:23 -08:00
uraniummeltdown
658bc95af0 diagonal icon smoothing support
added example diagonal smooth wall
abductor and survival pod walls smooth diagonally
new define for space icon state
fixed abductor walls having no sheet_type
2017-11-29 14:02:13 +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
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
Birdtalon
fc36a61b21 Fox adjustment 2017-08-15 18:32:23 +01:00