alberyk
2f93df0e0f
Merge branch 'master' into init_update_and_stuff
2022-03-05 17:05:46 -03:00
Wowzewow (Wezzy)
a2f6f55584
Beakers, bottles and syringe resprite ( #13096 )
2022-03-04 18:45:19 +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
mikomyazaki
93dde81d7b
Can throw over railings. ( #13207 )
2022-02-18 15:44:33 +01:00
Casper3667
134f5c345a
Reverts #13170 and #12989 ( #13194 )
...
* Revert "The loadout now properly substitutes job clothing. (#13170 )"
This reverts commit 650f14df92#12989 )"
This reverts commit 7745983a29mc-casper@hotmail.dk >
2022-02-16 00:50:33 +01:00
mikomyazaki
08ea043e69
Initialize and GC failure fixes #1 ( #13190 )
2022-02-15 23:45:30 +01:00
Wowzewow (Wezzy)
7745983a29
Ports funky closet animations from Yog ( #12989 )
2022-02-15 23:25:17 +01:00
alberyk
beecb5f802
Merge branch 'master' into fourth_week_preparation_and_fixes
...
# Conflicts:
# code/game/jobs/faction/zavodskoi.dm
2022-02-10 13:36:46 -03:00
Avery Marie
25ff6b47d7
Cyberwarfare suit buff ( #13038 )
2022-02-09 11:42:33 +01:00
Geeves
de1743a1b1
Railing Stuff ( #13035 )
2022-02-06 18:21:56 -03:00
alberyk
a61a4b7e2c
Merge branch 'master' into fixes_compile
2022-02-04 14:22:38 -03:00
Xxxxyobdab
c781e1c7ff
biogen/bush ( #13029 )
2022-02-04 12:22:01 +01:00
Jaraci
d3baa0c8e7
Security belts in lockers now spawn partially filled with stuff ( #13050 )
2022-02-04 00:54:37 +01:00
Wowzewow (Wezzy)
621e0c25a7
Fixes chairs for real this time I hope ( #12981 )
2022-02-01 12:49:53 +01:00
alberyk
3f86f85675
announcement fixes
2022-01-30 20:42:56 -03:00
alberyk
f96b0c4123
Merge branch 'master' into no_bluespace_fun
2022-01-29 20:46:29 -03:00
Casper3667
7ec55214e6
Fixes fake death not showing properly and time of death ( #12991 )
2022-01-30 00:23:08 +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
f7f3efa690
access tweaks
2022-01-20 22:52:52 -03:00
alberyk
11f7736d92
closet fixes
2022-01-20 19:27:28 -03:00
alberyk
8cd6f9ca66
Merge branch 'master' into final_shuttle_touches_and_stuff
...
# Conflicts:
# icons/turf/shuttle.dmi
2022-01-17 22:20:15 -03:00
Matt Atlas
5bcf84cb23
Overmap exoplanet generation, ported from Bay. ( #12362 )
2022-01-17 22:16:48 -03:00
alberyk
1dc3bb2dd8
Merge branch 'master' into final_shuttle_touches_and_stuff
2022-01-14 21:04:38 -03:00
Casper3667
4bc3466389
fixes the unathi mantle path ( #12891 )
2022-01-07 19:07:34 +01:00
Wowzewow (Wezzy)
cdc42acc76
Chair overlays fix ( #12879 )
2022-01-01 02:58:17 -03:00
alberyk
ffc66111e5
uniform
2021-12-29 23:19:44 -03:00
Geeves
1df88da53d
Whispering Refactor ( #12755 )
2021-12-27 22:44:57 +01:00
Wowzewow (Wezzy)
96f1c79d0e
Allows painting of padded stools, chairs and beds. ( #12855 )
2021-12-26 21:12:36 +01:00
Wowzewow (Wezzy)
e2abc62193
If it rains, you put on a coat. Rack. (Coatrack buffs.) ( #12829 )
2021-12-25 12:05:53 -03:00
Wowzewow (Wezzy)
25f4df810f
Chair fixes again ( #12866 )
...
* Chair fixes 3
fixes wheelchairs not being able to be picked up...again
* japed
2021-12-22 13:03:16 -03: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
Geeves
aec7d4748f
Full Window Blending ( #12732 )
...
* Full Window Blending
* cl
* last bits
* phoron windows
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com >
2021-12-19 22:10:34 +01:00
Wowzewow (Wezzy)
f038120838
My Pharmaceutical Romance (Labcoat sprite 2nd pass) ( #12823 )
...
* labcoat
* MY PHARMACEUTICAL ROMANCE
* Schiesse
* don't breathe this
* varucacaca
* you've got to be kidding me
* ass
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com >
2021-12-19 22:10:24 +01:00
Casper3667
7475c49d65
Adds hairnets ( #12860 )
...
* adds hairnets
* description change
Co-authored-by: TGW <mc-casper@hotmail.dk >
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com >
2021-12-19 22:09:58 +01:00
Casper3667
65ef181428
fixes chair dismantling being reversed ( #12841 )
...
Co-authored-by: TGW <mc-casper@hotmail.dk >
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com >
2021-12-19 05:10:34 +01:00
Casper3667
07cc46c38d
fixes railing jumping ( #12849 )
...
Co-authored-by: TGW <mc-casper@hotmail.dk >
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com >
2021-12-19 05:10:06 +01:00
Casper3667
e395c5c69a
fixes chair movement with mobs ( #12852 )
...
* fixes chair movement
* fixes fire extinguisher moving non-office chairs
* rollerbed fixes
Co-authored-by: TGW <mc-casper@hotmail.dk >
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com >
2021-12-19 05:10:00 +01:00
Wowzewow (Wezzy)
34b3196e69
Fixes chairs being righted with wrong material ( #12856 )
...
Title.
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com >
2021-12-19 05:09:54 +01:00
Wowzewow (Wezzy)
527698d6a8
Updates wheelchair code for the new chair-lennium. ( #12813 )
2021-12-07 13:52:58 -03:00
Wowzewow (Wezzy)
332f266cec
Wheelchair fix ( #12812 )
2021-12-04 15:33:22 +01:00
Werner
ae58ffe264
Away Mission Events ( #12802 )
2021-12-04 02:23:24 +01:00
Wowzewow (Wezzy)
56c16bf208
Colorable Chairs, Stools, and other phoney baloney ( #12797 )
2021-12-02 22:57:24 +01:00
Casper3667
5773467beb
adds epmc labcoat and taj cloak coatrack sprites ( #12683 )
2021-11-02 15:02:57 -03: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
alberyk
76544b9cd8
rename
2021-10-29 21:23:43 -03:00
Casper3667
fb13f6615f
Adds sensitive hearing ( #12151 )
2021-10-15 19:02:12 +02: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
nerocavalier
a4fe59e8b3
Changes Captain's and HoP's pcarrier to match their helmets ( #12534 )
2021-10-02 18:58:30 -03:00
desven
3f99489ea6
Adds a few more hand sprites ( #12535 )
2021-09-25 21:44:21 +02:00
