Commit Graph

1374 Commits

Author SHA1 Message Date
WickedCybs
d011f8428b Horizon Shuttle Enhancements: Multiple Areas + Power + Layout Changes (#13691) 2022-05-08 18:03:34 +02:00
SleepyGemmy
7387080448 Reworks Portable Generators (#13663) 2022-05-06 13:59:01 +02:00
mikomyazaki
e59589ec8a Gripper attackby fixes (#13571)
This cannot go wrong, can it?
2022-04-20 22:15:15 +02:00
Doxxmedearly
73365fa652 Fixes borg cable coil color changing (#13566) 2022-04-18 19:15:12 +02:00
Wildkins
8a28865697 Fix security camera consoles, hopefully (#13507) 2022-04-14 20:27:39 -03:00
Matt Atlas
0961a9457c Colored light tubes and bulbs no longer randomize their color. (#13458) 2022-04-11 19:17:35 +02:00
Alberyk
12822dac7b Blast doors and emitter sound fixes (#13447)
* Blast doors and emitter fix

* changelog
2022-04-10 16:31:29 -03:00
alberyk
8c1d2a7cde Merge branch 'master' into final_away_maps_additions
# Conflicts:
#	code/__defines/misc.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
#	icons/mob/head.dmi
#	maps/exodus/code/exodus.dm
2022-04-04 19:47:58 -03:00
gem
cb696d6dd4 Gloves Not Required to Remove Bulbs and Tubes (#13277) 2022-03-19 14:57:19 +01:00
VisVirific
6e9f5c9e29 fractal reactor message tweak (#13370) 2022-03-14 12:27:01 +01:00
mikomyazaki
b1b29a740e Breaker boxes no longer set_state twice (in Initialize and LateInitialize) thus spawning overlapping cables in each direction and failing unit test for power cables. 2022-03-06 18:27:37 +00:00
alberyk
f0e32eec35 Merge branch 'master' into ship_and_stuff
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
2022-03-04 14:00:19 -03:00
Matt Atlas
290a303b2c Red and blue lights no longer randomize their color. (#13264) 2022-02-24 12:54:58 +01:00
alberyk
12a70b50b7 Merge branch 'master' into updates_the_nbt
# Conflicts:
#	code/__defines/misc.dm
#	code/game/machinery/machinery.dm
#	maps/_common/mapsystem/map.dm
2022-02-19 10:26:35 -03:00
Matt Atlas
3eff83733c Moodier station lighting, randomized light colors and code red lighting. (#13066) 2022-02-11 16:15:20 +01:00
alberyk
a61a4b7e2c Merge branch 'master' into fixes_compile 2022-02-04 14:22:38 -03:00
Wowzewow (Wezzy)
d2c2fbd19c APC fix number 3 (#12992) 2022-02-02 16:52:49 +01:00
alberyk
f8ebe1bda4 Merge branch 'master' into prepare_stuff_for_second_week 2022-01-29 13:09:18 -03:00
Matt Atlas
2842f4e39f Finish porting bay's timer SS (#12978) 2022-01-29 13:07:51 -03:00
alberyk
9615a17ecc loadoutfixes 2022-01-22 12:36:12 -03:00
alberyk
e92d839fbf fix 2022-01-17 21:28:35 -03:00
alberyk
cf3b089df4 Merge branch 'master' into final_shuttle_touches_and_stuff
# Conflicts:
#	code/modules/power/breaker_box.dm
2022-01-17 19:36:22 -03:00
Wowzewow (Wezzy)
10be902c6e Updates power.dmi to be up to snuff. (#12803) 2022-01-16 13:32:01 +01:00
alberyk
4b32268c1a Merge branch 'master' into final_shuttle_touches_and_stuff
# Conflicts:
#	code/game/objects/structures/window.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
2021-12-21 16:51:40 -03:00
Wowzewow (Wezzy)
56c16bf208 Colorable Chairs, Stools, and other phoney baloney (#12797) 2021-12-02 22:57:24 +01:00
Casper3667
f845f9a85b makes vaurca not suffocate when hanged (#12748)
changelog

Co-authored-by: TGW <mc-casper@hotmail.dk>
2021-11-13 13:42:19 +01:00
alberyk
2294b4f0c5 Merge branch 'master' into computer_tweaks
# Conflicts:
#	code/game/jobs/faction/eridani.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/civilian_chaplain.dm
#	code/game/jobs/job/science.dm
#	icons/obj/machines/shielding.dmi
2021-10-29 21:41:30 -03:00
Casper3667
fb13f6615f Adds sensitive hearing (#12151) 2021-10-15 19:02:12 +02:00
alberyk
deb4a92282 console stuff 2021-10-10 15:08:16 -03:00
alberyk
805ffc2f85 Merge branch 'master' into computer_tweaks
# Conflicts:
#	code/game/jobs/job/ship_crew.dm
2021-10-10 13:18:14 -03:00
Alberyk
e4dabb9555 Roundstart smes tweak (#12477) 2021-10-01 14:00:55 -03:00
Werner
92d164ac09 Merge branch 'upstream-master' into placeholder 2021-09-07 00:00:37 +02:00
Geeves
c4b0089749 Synthetic Smörgåsbord (#12417) 2021-09-06 22:47:27 +02:00
Alberyk
92bbc463b4 Merge branch 'master' into bridge_gaming 2021-08-24 22:49:24 -03:00
Geeves
c8eaa429b7 Inductive Charger Fix (#12379)
* Inductive Charger Fix

* more cl
2021-08-24 15:11:54 -03:00
Geeves
e3c9927661 Turret and Solar Panel Rotation (#12241) 2021-08-17 17:21:50 +02:00
Geeves
d52e966c56 Roundstart SMES (#12230) 2021-08-05 18:09:01 +02:00
Geeves
b53fa357ed Matriarch Drones (#12275)
* Matriarch Drones

* forgot this
2021-08-05 13:01:50 -03:00
Erki
9eb663da66 Merge branch 'master' into newmap-master
# Conflicts:
#	aurorastation.dme
2021-07-13 22:19:58 +03:00
Geeves
f4aa217798 Siemens Checking (#11864) 2021-05-25 14:34:20 +02:00
Geeves
6babb387fa Tesla Equipment Sprites (#11821) 2021-05-08 11:25:09 +02:00
Geeves
1917dcf683 Blueprint Blueprints (#11774) 2021-05-01 11:21:43 +02:00
Ferner
5fc38a01e8 Merge branch 'master' into placeholder 2021-04-10 19:20:48 +02:00
Geeves
f631f478fa Radial Floodlight (#11120) 2021-04-06 23:12:53 -03:00
Wildkins
a091223b40 Fix AI interactions with VUI APCs (#11605) 2021-04-05 22:03:47 +02:00
MarinaGryphon
d29806094a VueUI Conversions and Style Tweaks (#11523) 2021-03-25 17:18:44 +01:00
Ferner
689605118a Merge branch 'master' into placeholder 2021-03-07 20:50:42 +01:00
Geeves
5709d47a14 Light Fixture Spark Fix (#11387) 2021-03-07 13:05:28 -03:00
Ferner
4b66c36b35 Merge branch 'master' into placeholder 2021-03-02 18:13:37 +01:00
Matt Atlas
622612d077 Revert "New Check" (#11344) 2021-03-01 18:24:59 +01:00