3600 Commits
Author SHA1 Message Date
alberyk 7693c2a54a the rest 2022-01-02 00:06:46 -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
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
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)andGitHub 56c16bf208 Colorable Chairs, Stools, and other phoney baloney (#12797) 2021-12-02 22:57:24 +01:00
Casper3667andGitHub 27f8b5320d fixes paperbags becoming invisible (#12804) 2021-12-01 17:20:47 +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 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
Casper3667andGitHub fb13f6615f Adds sensitive hearing (#12151) 2021-10-15 19:02:12 +02:00
WickedCybsandGitHub 756be9a3c8 Antag Implants Will No Longer Point To an Unusable Emote (#12614) 2021-10-13 21:40:19 +02:00
AlberykandGitHub 5501c85523 Add hammers (#12505) 2021-10-11 22:44:59 -03:00
listerlaandGitHub 590ac615ee Decapitalizes soap (#12602) 2021-10-11 20:10:33 -03: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
7aead932b0 Fixes cigarette slot placement when extinguished (#12589)
Co-authored-by: TGW <mc-casper@hotmail.dk>
2021-10-07 17:09:55 -03:00
Casper3667andGitHub c86de6b84c Adds tajaran charms to the loadout (#12576) 2021-10-06 19:09:42 -03:00
GeevesandGitHub 6fed849316 Sprite Generation Tweak (#12503) 2021-10-05 14:55:31 -03:00
desvenandGitHub 90aa41245f Preparations for Vaurca events (#12565) 2021-10-02 18:55:59 -03:00
desvenandGitHub 51495ad840 Adds Vaurca nitrile and botany gloves (#12544) 2021-09-28 01:42:47 -03:00
alberyk ae15e82f76 All jobs 2021-09-23 23:07:28 -03:00
Casper3667andGitHub 91d7cac9da Fixes loadout renaming runtimes (#12497) 2021-09-17 12:53:47 +02:00
desvenandGitHub 3aa1b013e5 New tunnel cloaks (#12464) 2021-09-14 14:07:59 +02:00
nerocavalierandGitHub 641e934032 Handcuff teamwork (#12481) 2021-09-13 11:31:08 +02:00
WickedCybsandGitHub 06bd0671ab RFD-C's Can Now Build Flooring on Open Space (#12456) 2021-09-07 12:11:53 +02:00
GeevesandGitHub c4b0089749 Synthetic Smörgåsbord (#12417) 2021-09-06 22:47:27 +02:00
desvenandGitHub 995875d9e6 Adds Citizenship and Religion to the Agent ID (#12368) 2021-09-02 12:52:34 -03:00
GeevesandGitHub 15aaa4e873 Powerful Mechs (#12193) 2021-08-31 18:05:09 +02:00
JaraciandGitHub 39818d2caf Sets the default bite size/transfer amount on all utensils to be the minimum. (#12386) 2021-08-28 03:18:39 +02:00
AlberykandGitHub b830b51a33 Fixes some Tajaran loadout items (#12394) 2021-08-27 13:15:44 +02:00
desvenandGitHub 2e5d4d5bd3 Adds a Sedantis lunchbox (#12381) 2021-08-27 12:10:55 +02:00
desvenandGitHub 6eff45c430 Ports paperbags from tg (#12320) 2021-08-25 14:12:57 +02:00
desvenandGitHub a04ea25793 The Lii'dra update (#12366) 2021-08-25 14:09:22 +02:00
desvenandGitHub 017296be81 Fixes the pineapple sound for real this time (#12370) 2021-08-23 17:49:39 -03:00
desvenandGitHub 7a2a7f7a62 Adds bugsnax (#12351) 2021-08-22 12:25:18 +02:00
desvenandGitHub b77b667044 Fixes the can of pineapple rings having the same sounds and descriptions as a regular can (#12354) 2021-08-20 01:09:30 -03:00
SparkyandGitHub 9d69fe4984 Wiping Cutlery Clears Food (#12334) 2021-08-17 19:59:18 +02:00
WickedCybsandGitHub 498be943bc Eridani ERT Access Fix (#12340) 2021-08-16 01:17:01 -03:00
JaraciandGitHub d77908739b Allows some more stuff to go in the emergency survival box (#12297) 2021-08-11 18:14:01 -03:00
GeevesandGitHub b90510b951 Experimental Welding Tool Upgrades (#12196) 2021-08-05 13:03:28 -03:00
GeevesandGitHub 49a801ee19 Constructable Mining Machines (#12212) 2021-08-05 13:03:20 -03:00