5463 Commits
Author SHA1 Message Date
mikomyazakiandGitHub 9dfe8c3dd9 Fixes infinite item bug with lathes, and corrects multi-material fill message bug. (#13142) 2022-02-13 17:30:12 +01:00
gemandGitHub 9111fdf833 Re-Adds Lighters and Dice as Valid Wallet Items (#13133)
* N/A

* N/A

* N/A
2022-02-12 13:19:35 -03:00
Casper3667andGitHub 822ca84d78 Allows the tajaran lighter to be opened with alt click (#13115) 2022-02-11 17:42:35 -03:00
Matt AtlasandGitHub 3eff83733c Moodier station lighting, randomized light colors and code red lighting. (#13066) 2022-02-11 16:15:20 +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
SparkyandGitHub a7aaf27c81 Limits what can go in wallets. (#13076)
* inhaler

* 180
2022-02-06 18:11:43 -03:00
alberyk e6a2349a04 Merge branch 'master' into cables_fixes 2022-02-06 13:38:46 -03:00
b035a0b8e4 fixes representative wrist and double radio keys (#13106)
Co-authored-by: TGW <mc-casper@hotmail.dk>
2022-02-06 12:01:27 -03: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
GeevesandGitHub d75c99fbdf Stacking Die (#12929) 2022-02-02 17:13:06 +01:00
listerlaandGitHub 41d95db508 Adds a pair of human lore-related book items (#12903) 2022-02-02 17:00:21 +01:00
alberyk 00e9a6b728 UNshits robotics 2022-01-31 00:26:06 -03:00
alberyk f96b0c4123 Merge branch 'master' into no_bluespace_fun 2022-01-29 20:46:29 -03:00
Casper3667andGitHub 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 AtlasandGitHub 2842f4e39f Finish porting bay's timer SS (#12978) 2022-01-29 13:07:51 -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 AtlasandGitHub 5bcf84cb23 Overmap exoplanet generation, ported from Bay. (#12362) 2022-01-17 22:16:48 -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
Casper3667andGitHub 63c6d26c90 Changes some parts of forensic (#12869) 2022-01-16 14:20:23 +01:00
alberyk 1dc3bb2dd8 Merge branch 'master' into final_shuttle_touches_and_stuff 2022-01-14 21:04:38 -03:00
Casper3667andGitHub 5fd687cf59 fixes glass business card overlays (#12893) 2022-01-07 19:16:47 +01:00
Casper3667andGitHub d3604b939c fixes cryobags deploying (#12892) 2022-01-07 19:16:37 +01:00
alberyk 7693c2a54a the rest 2022-01-02 00:06:46 -03:00
Wowzewow (Wezzy)andGitHub 96f1c79d0e Allows painting of padded stools, chairs and beds. (#12855) 2021-12-26 21:12:36 +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
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
2003515939 Grab Stuff (#12731)
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
2021-12-19 22:10:40 +01:00
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
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
llywynandGitHub dfa17ffd18 Nralakk projector typo fix (#12808) 2021-12-04 02:23:13 +01:00
Wowzewow (Wezzy)andGitHub 56c16bf208 Colorable Chairs, Stools, and other phoney baloney (#12797) 2021-12-02 22:57:24 +01:00
Casper3667andGitHub 5cad105579 Makes neck bandannas into accessories (#12787) 2021-12-02 22:56:59 +01:00
Casper3667andGitHub 1afeff7954 Allows the holomenu to be read from any distance (#12781) 2021-12-01 18:45:18 +01:00
Casper3667andGitHub 27f8b5320d fixes paperbags becoming invisible (#12804) 2021-12-01 17:20:47 +01:00
Casper3667andGitHub 9344e224ba fixes runtime errors and let bodybags be placed adjacent (#12774) 2021-11-21 21:03:54 +01:00
Casper3667andGitHub 85bc0c3afb adds helpful descriptions to certain items (#12743) 2021-11-21 21:03:19 +01:00
GeevesandGitHub 2af358500d Teleportation Tweaks (#12487) 2021-11-21 21:00:48 +01:00
Casper3667andGitHub a662254beb fixes urns not being able to pick up ashes (#12777) 2021-11-21 15:32:31 -03:00
WernerandGitHub 1dcd78f4a8 Reconstructible Research Shuttle Console (#12736) 2021-11-08 00:53:56 +01:00
Casper3667andGitHub f60c47d443 Radio message fixes (#12724) 2021-11-03 19:34:53 -03:00
Casper3667andGitHub 4be21103ce Bulwark & taj clothing sprite fixes (#12704) 2021-10-31 23:47:47 -03:00
desvenandGitHub c7475c96a3 Even more Bulwark sprites and fixes (#12687) 2021-10-30 13:56:48 +02:00
GeevesandGitHub e2d86c76de Storage Opening (#12640) 2021-10-30 13:56:35 +02: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
GeevesandGitHub 69df1289f1 Bulwark Fixes Again (#12678) 2021-10-25 15:04:38 -03:00
nerocavalierandGitHub f012311bce Buffs frag grenades. (#12542) 2021-10-25 12:13:10 +02:00
GeevesandGitHub 46007880ab Equip-O-Matic (#12641) 2021-10-25 12:12:46 +02:00
desvenandGitHub 378b76c59e Fixes the worn towel by the Bulwark (#12669) 2021-10-21 22:23:04 -03:00