Commit Graph

18971 Commits

Author SHA1 Message Date
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
Jaraci
b55a4e206b Adds Elyran Standard language (#12880) 2022-01-17 16:52:00 +01:00
Casper3667
9e732afe63 Changes how forensic machine reports works (#12868) 2022-01-17 16:51:52 +01:00
alberyk
1391c90fa1 shuttles 2022-01-16 15:07:06 -03:00
Casper3667
63c6d26c90 Changes some parts of forensic (#12869) 2022-01-16 14:20:23 +01:00
listerla
c92c438184 Updates Dominian citizenship & religion lore (#12901) 2022-01-16 14:09:47 +01:00
Wowzewow (Wezzy)
10be902c6e Updates power.dmi to be up to snuff. (#12803) 2022-01-16 13:32:01 +01:00
Casper3667
acba5cd3e0 Allows the sinta hood to fit on the ear slot (#12885) 2022-01-16 13:31:48 +01:00
listerla
b83c72ec18 Marking cleanup, bugfixes, and one addition (#12899) 2022-01-16 13:31:26 +01:00
Jaraci
9aed30d505 Removes Elyran citizenship and accent from Skrell (#12906) 2022-01-16 13:31:14 +01:00
alberyk
1dc3bb2dd8 Merge branch 'master' into final_shuttle_touches_and_stuff 2022-01-14 21:04:38 -03:00
Casper3667
23da831eed Gives business cards color when copied and fixes copier bugs (#12894) 2022-01-12 12:12:58 +01:00
Dekserrrrrr
d5a6d8d101 organ stuff (#12875) 2022-01-12 12:06:08 +01:00
Casper3667
180818f2f8 Fixes tendon repair surgery (#12897)
Co-authored-by: TGW <mc-casper@hotmail.dk>
2022-01-09 01:31:54 +01:00
Casper3667
f37e47049a fixes thakhist head wrappings (#12889) 2022-01-07 19:17:00 +01:00
Geeves
19d66888b3 Skrell Stuff (#12888) 2022-01-07 19:08:33 +01:00
Casper3667
4bc3466389 fixes the unathi mantle path (#12891) 2022-01-07 19:07:34 +01:00
Geeves
66acb4bd54 Crit Whisper Fix (#12887) 2022-01-03 22:23:19 +01:00
alberyk
5b79b18186 bug fix 2022-01-02 17:07:35 -03:00
alberyk
56c7575f6d fixes 2022-01-02 04:15:19 -03:00
alberyk
9fb2fa737b more fixes 2022-01-02 02:34:51 -03:00
alberyk
7693c2a54a the rest 2022-01-02 00:06:46 -03:00
alberyk
ad072cd91b more job sprites 2022-01-01 23:24:25 -03:00
Matt Atlas
5234c0544a Fixes evac shuttles being called as transfer shuttles, fixes shuttle arrive time announcement. (#12876) 2021-12-30 22:10:05 +01:00
alberyk
409e26cc4b uniform 2021-12-29 23:50:00 -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
Dekserrrrrr
df683af125 Adds Unathi hissing sounds (#12690) 2021-12-26 21:14:38 +01:00
Wowzewow (Wezzy)
96f1c79d0e Allows painting of padded stools, chairs and beds. (#12855) 2021-12-26 21:12:36 +01:00
Casper3667
951e9b95f1 adds a new vest to the loadout (#12844) 2021-12-24 02:59:03 -03:00
Casper3667
a810c9a9f8 targets of mind reading now gets informed how long they got to respond (#12853) 2021-12-23 13:33:45 -03:00
Casper3667
80bde64be4 Makes skrell psi ping detect most simplemobs (#12835) 2021-12-23 13:25:50 -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
Casper3667
c700d6b140 Minor forensic additions (#12842)
* makes forensic equipment only be put in bags on help intent

* Updates description of some forensic equipment

* changelog typo fix

* updates swab kits

* Adds a suggestion

Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

* Update code/modules/detectivework/tools/sample_kits.dm

Co-authored-by: TGW <mc-casper@hotmail.dk>
Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
2021-12-20 21:35:23 +01:00
Werner
619ca5ce69 Update rust_g to 0.5.0+a2 (#12865)
Co-authored-by: Werner <Arrow768@users.noreply.github.com>
2021-12-19 23:22:29 +01:00
Wowzewow (Wezzy)
0549da254f Business card buffs (#12810)
* bizniz cards

* Buffs business cards.

* Update wezzy_businesscardbuffs.yml

* oops

* Update code/game/objects/items/weapons/storage/business_card.dm

Co-authored-by: Casper3667 <8396443+Casper3667@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/business_card.dm

Co-authored-by: Casper3667 <8396443+Casper3667@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/business_card.dm

Co-authored-by: Casper3667 <8396443+Casper3667@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/business_card.dm

Co-authored-by: Casper3667 <8396443+Casper3667@users.noreply.github.com>

* fix

* Update wezzy_businesscardbuffs.yml

* makes business cards unfoildable and glass immune to fire

* KOLORS

* spy fortress 2

* dent

* A

* undoes purse change

Co-authored-by: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Co-authored-by: TGW <mc-casper@hotmail.dk>
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
2021-12-19 22:22:28 +01:00
Karolis
2aa1ca17b7 Code clean up, makes use of states PROPERLY (#12831)
* Code clean up, makes use of states PROPERLY

* I forgot how to new

* Fix

* Changelog

* 7th vueui arg is data.

* Adds check if topic is proxied by vueui

* Admin topic state refactor

Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
2021-12-19 22:17:03 +01:00
Geeves
2003515939 Grab Stuff (#12731)
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
2021-12-19 22:10:40 +01:00
desven
016306cb38 code (#12737)
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
2021-12-19 22:10:29 +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
1ced8f528a Increases the time for unathi to break handcuffs to 10 seconds (#12836)
Co-authored-by: TGW <mc-casper@hotmail.dk>
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
2021-12-19 22:10:11 +01:00
Casper3667
2e743171c7 Fixes borer & glass jar interaction and adds identifying numbers to borer names (#12851)
* Fixes some borer bugs

* changelog fix

Co-authored-by: TGW <mc-casper@hotmail.dk>
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
2021-12-19 22:10:04 +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
749c6517f4 Modifies Kathira's custom augment (#12859) 2021-12-19 21:19:15 +01:00
Casper3667
973213d783 Changes vomitting to take from nutrients too (#12837)
* permits vomitting from nutrition

* changelog

Co-authored-by: TGW <mc-casper@hotmail.dk>
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
2021-12-19 05:11:29 +01:00
Casper3667
ca5e6bfec8 restricts eridani from being consulars (#12838)
Co-authored-by: TGW <mc-casper@hotmail.dk>
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
2021-12-19 05:11:13 +01:00
Casper3667
b1621bf9cb fixes problems with the sechud record (#12839)
Co-authored-by: TGW <mc-casper@hotmail.dk>
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
2021-12-19 05:11:02 +01:00
Casper3667
83d7936ccd fixes folders not being renamable when standing next to them (#12845)
Co-authored-by: TGW <mc-casper@hotmail.dk>
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
2021-12-19 05:10:12 +01:00
Casper3667
9db3249cf1 Fixes a set of reversed pain checks in sensitive hearing (#12858)
* Fixes a set of reversed pain checks

* typo fix

Co-authored-by: TGW <mc-casper@hotmail.dk>
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
2021-12-19 05:09:45 +01:00