Commit Graph

4798 Commits

Author SHA1 Message Date
alberyk
f8ebe1bda4 Merge branch 'master' into prepare_stuff_for_second_week 2022-01-29 13:09:18 -03:00
Matt Atlas
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 Atlas
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
Casper3667
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
Casper3667
5fd687cf59 fixes glass business card overlays (#12893) 2022-01-07 19:16:47 +01:00
Casper3667
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)
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
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
Geeves
2003515939 Grab Stuff (#12731)
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
2021-12-19 22:10:40 +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
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
llywyn
dfa17ffd18 Nralakk projector typo fix (#12808) 2021-12-04 02:23:13 +01:00
Wowzewow (Wezzy)
56c16bf208 Colorable Chairs, Stools, and other phoney baloney (#12797) 2021-12-02 22:57:24 +01:00
Casper3667
5cad105579 Makes neck bandannas into accessories (#12787) 2021-12-02 22:56:59 +01:00
Casper3667
1afeff7954 Allows the holomenu to be read from any distance (#12781) 2021-12-01 18:45:18 +01:00
Casper3667
27f8b5320d fixes paperbags becoming invisible (#12804) 2021-12-01 17:20:47 +01:00
Casper3667
9344e224ba fixes runtime errors and let bodybags be placed adjacent (#12774) 2021-11-21 21:03:54 +01:00
Casper3667
85bc0c3afb adds helpful descriptions to certain items (#12743) 2021-11-21 21:03:19 +01:00
Geeves
2af358500d Teleportation Tweaks (#12487) 2021-11-21 21:00:48 +01:00
Casper3667
a662254beb fixes urns not being able to pick up ashes (#12777) 2021-11-21 15:32:31 -03:00
Werner
1dcd78f4a8 Reconstructible Research Shuttle Console (#12736) 2021-11-08 00:53:56 +01:00
Casper3667
f60c47d443 Radio message fixes (#12724) 2021-11-03 19:34:53 -03:00
Casper3667
4be21103ce Bulwark & taj clothing sprite fixes (#12704) 2021-10-31 23:47:47 -03:00
desven
c7475c96a3 Even more Bulwark sprites and fixes (#12687) 2021-10-30 13:56:48 +02:00
Geeves
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
Geeves
69df1289f1 Bulwark Fixes Again (#12678) 2021-10-25 15:04:38 -03:00
nerocavalier
f012311bce Buffs frag grenades. (#12542) 2021-10-25 12:13:10 +02:00
Geeves
46007880ab Equip-O-Matic (#12641) 2021-10-25 12:12:46 +02:00
desven
378b76c59e Fixes the worn towel by the Bulwark (#12669) 2021-10-21 22:23:04 -03:00
desven
bdf6882f65 More lore foods (#12645) 2021-10-19 20:47:28 -03:00
Casper3667
80b2da13ff adds starlight residency cards to skrell (#12643) 2021-10-19 18:39:42 -03:00
Casper3667
fb13f6615f Adds sensitive hearing (#12151) 2021-10-15 19:02:12 +02:00
WickedCybs
756be9a3c8 Antag Implants Will No Longer Point To an Unusable Emote (#12614) 2021-10-13 21:40:19 +02:00
Alberyk
5501c85523 Add hammers (#12505) 2021-10-11 22:44:59 -03:00
listerla
590ac615ee Decapitalizes soap (#12602) 2021-10-11 20:10:33 -03:00
Geeves
6ba257f7a5 Unathi Clothes Fix (#12603) 2021-10-11 17:35:25 -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
Forester40
489c582276 Fixes several typos and removes several redundant lines of code for item descriptions (#12593) 2021-10-10 15:44:40 +02:00
Casper3667
1c4e76e673 adds a fuller quarter-turf decal to paint guns (#12584)
* adds a fuller quarter-turf decal

* minor fix

* sprite update

Co-authored-by: TGW <mc-casper@hotmail.dk>
2021-10-10 15:44:24 +02:00
Casper3667
7aead932b0 Fixes cigarette slot placement when extinguished (#12589)
Co-authored-by: TGW <mc-casper@hotmail.dk>
2021-10-07 17:09:55 -03:00
kyres1
b59fc11ecc Adds rooftop event assets (#12572) 2021-10-06 19:21:15 -03:00
Geeves
ba26b07407 Backpack Inhand Fix (#12591) 2021-10-06 19:12:34 -03:00
Casper3667
c86de6b84c Adds tajaran charms to the loadout (#12576) 2021-10-06 19:09:42 -03:00
Geeves
6fed849316 Sprite Generation Tweak (#12503) 2021-10-05 14:55:31 -03:00