925 Commits
Author SHA1 Message Date
SleepyGemmyandGitHub fa39d14da8 Custodial Uniform Tweaks (#13979) 2022-05-23 13:36:41 +02:00
FlamingLilyandGitHub 479760dca8 Marshalling Wands (#13627) 2022-05-22 17:40:48 +02:00
DoxxmedearlyandGitHub 62440aa0a1 Fixes Unusual Container Recursion Bug (#13980) 2022-05-17 03:23:19 +02:00
Wowzewow (Wezzy)andGitHub ccd3c122b2 Some Fixes (#13970) 2022-05-16 18:50:58 +02:00
DoxxmedearlyandGitHub 05d908103d Unusual Container Fixes (#13969) 2022-05-16 12:40:42 +02:00
VisVirificandGitHub 7c01cc4bfa Medical Wall Lockers Fix (#13952) 2022-05-15 12:44:15 +02:00
VisVirificandGitHub 5c30e283ed Level-3 Biohazard Closet Fix (#13917) 2022-05-13 17:55:58 +02:00
Wowzewow (Wezzy)andGitHub 3e8f9e0901 The Uniformity : The Confluence of Conformity (#13773) 2022-05-13 12:08:50 +02:00
WildkinsandGitHub 3f7a79236e Outfit and Access Spring Cleaning (#13876) 2022-05-11 19:14:05 +02:00
WildkinsandGitHub 73a3bd11c5 Fix loot crate runtime + bad mapped-in crate paths (#13747) 2022-05-02 11:02:19 +02:00
Wowzewow (Wezzy)andGitHub a65ef5cd26 The Crate Animatening, A.K.A. I hate Crate Trigonometry (#13339) 2022-04-30 02:04:15 -03:00
Werner a6e7774143 Merge branch 'upstream-master' into placeholder 2022-04-10 13:09:22 +02:00
mikomyazakiandGitHub a0992e257e New Investigator QoL/Features (#13422) 2022-04-10 12:57:05 +02: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
SparkyandGitHub 51cc7664ac New Station Bounced Sprites (#12935) 2022-03-12 15:08:26 +01:00
alberyk 2f93df0e0f Merge branch 'master' into init_update_and_stuff 2022-03-05 17:05:46 -03:00
Wowzewow (Wezzy)andGitHub a2f6f55584 Beakers, bottles and syringe resprite (#13096) 2022-03-04 18:45:19 +01:00
134f5c345a Reverts #13170 and #12989 (#13194)
* Revert "The loadout now properly substitutes job clothing. (#13170)"

This reverts commit 650f14df92.

* Revert "Ports funky closet animations from Yog (#12989)"

This reverts commit 7745983a29.

Co-authored-by: TGW <mc-casper@hotmail.dk>
2022-02-16 00:50:33 +01:00
Wowzewow (Wezzy)andGitHub 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 MarieandGitHub 25ff6b47d7 Cyberwarfare suit buff (#13038) 2022-02-09 11:42:33 +01:00
alberyk a61a4b7e2c Merge branch 'master' into fixes_compile 2022-02-04 14:22:38 -03:00
JaraciandGitHub d3baa0c8e7 Security belts in lockers now spawn partially filled with stuff (#13050) 2022-02-04 00:54:37 +01: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 1dc3bb2dd8 Merge branch 'master' into final_shuttle_touches_and_stuff 2022-01-14 21:04:38 -03:00
Casper3667andGitHub 4bc3466389 fixes the unathi mantle path (#12891) 2022-01-07 19:07:34 +01:00
alberyk ffc66111e5 uniform 2021-12-29 23:19:44 -03:00
GeevesandGitHub 1df88da53d Whispering Refactor (#12755) 2021-12-27 22:44:57 +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
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
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
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
Casper3667andGitHub 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
nerocavalierandGitHub a4fe59e8b3 Changes Captain's and HoP's pcarrier to match their helmets (#12534) 2021-10-02 18:58:30 -03:00
alberyk e8e0e4bbb0 More job stuff and spawn points 2021-09-24 02:30:05 -03:00
alberyk 224acea24a tweaks 2021-09-24 01:40:00 -03:00
alberyk 8c5a10cf8b closet stuff 2021-09-24 01:32:10 -03:00
alberyk ae15e82f76 All jobs 2021-09-23 23:07:28 -03:00
WickedCybsandGitHub 2e4d561846 Condenses Medical Outerwear Into Its Own Selection + A First Responder Jacket Change (#12450) 2021-09-08 23:11:17 -03:00
nerocavalierandGitHub 7cfdf11681 Adds gasmask to hos locker (#12442) 2021-09-07 12:12:40 +02:00
nerocavalierandGitHub 4e3017f7c3 Replaces Investigator's pcarrier with Sec pcarrier (#12426) 2021-09-03 13:08:59 -03:00
JaraciandGitHub bd1ccbd797 Trims the spawn-in job gear for first responders (#12419) 2021-09-02 18:39:21 +02:00
BLUNTFORCE420andGitHub e8a179070a Resprites the automatic .45. (#12391) 2021-08-29 22:33:30 +02:00
JaraciandGitHub 4c47e62b3b Modifies some security loadouts for QOL. (#12359) 2021-08-24 18:34:52 +02:00
Casper3667andGitHub b67ec66b30 Upgrades the coat racks and adds security labcoats (#12264) 2021-08-01 21:31:06 -03:00
GeevesandGitHub 471c87c490 Radsuit Resprite (#12145) 2021-07-08 14:10:52 -03:00
a43fe7005f adds supply & service encryption keys (#12119)
Co-authored-by: TheGreyWolf <mc-casper@hotmail.dk>
2021-07-03 21:50:56 +02:00