Commit Graph

1785 Commits

Author SHA1 Message Date
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
alberyk
b37dfdcb96 shuttle stuff 2021-09-24 18:33:32 -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
alberyk
807769071b Merge branch 'master' into medbay_fixes_and_shit 2021-09-22 22:29:51 -03:00
Alberyk
6ea66b23f6 Adds new full windows (#12434) 2021-09-17 12:36:40 +02:00
Lucaken
7f49b04cae Adds a Vysokan flag and banner (#12439) 2021-09-13 14:52:18 +02:00
nerocavalier
4bed68c7e8 Ports CM's click on nearby tile to deploy roller bed. (#12461) 2021-09-10 15:07:25 +02:00
WickedCybs
2e4d561846 Condenses Medical Outerwear Into Its Own Selection + A First Responder Jacket Change (#12450) 2021-09-08 23:11:17 -03:00
nerocavalier
7cfdf11681 Adds gasmask to hos locker (#12442) 2021-09-07 12:12:40 +02:00
Werner
92d164ac09 Merge branch 'upstream-master' into placeholder 2021-09-07 00:00:37 +02:00
nerocavalier
4e3017f7c3 Replaces Investigator's pcarrier with Sec pcarrier (#12426) 2021-09-03 13:08:59 -03:00
Alberyk
e58c807b8c jobs 2021-09-02 15:13:08 -03:00
Jaraci
bd1ccbd797 Trims the spawn-in job gear for first responders (#12419) 2021-09-02 18:39:21 +02:00
Alberyk
9a12064cb6 Adds virtual reality human bodies (#12403) 2021-08-31 17:54:35 +02:00
BLUNTFORCE420
e8a179070a Resprites the automatic .45. (#12391) 2021-08-29 22:33:30 +02:00
Alberyk
3055addda2 icon fix again 2021-08-26 21:15:17 -03:00
Alberyk
2d24fc47fa fix window placeholder 2021-08-26 21:14:41 -03:00
Alberyk
92bbc463b4 Merge branch 'master' into bridge_gaming 2021-08-24 22:49:24 -03:00
Jaraci
4c47e62b3b Modifies some security loadouts for QOL. (#12359) 2021-08-24 18:34:52 +02:00
Alberyk
6810632cd8 wall unfucking 2021-08-22 12:47:20 -03:00
Alberyk
f5548eb5e3 Merge branch 'master' into updates_stuff
# Conflicts:
#	code/game/objects/structures/window.dm
2021-08-04 23:08:28 -03:00
Alberyk
48adf7f5cf New scc shuttle walls and windows (#12284) 2021-08-04 16:21:40 -03:00
Casper3667
b67ec66b30 Upgrades the coat racks and adds security labcoats (#12264) 2021-08-01 21:31:06 -03:00
Geeves
db3198b11e Multi-tile Airlock Fixes | Airlock QoL (#12249) 2021-07-31 17:31:47 -03:00