Commit Graph

91587 Commits

Author SHA1 Message Date
ktlwjec
30670f7565 adds moscow mule (#18628) 2023-05-01 19:09:19 -04:00
Changelogs
3571e8e1fd Automatic changelog compile [ci skip] 2023-05-01 22:15:39 +00:00
Yogbot-13
d7a64ec47a Automatic changelog generation #18662 [ci skip] 2023-05-01 14:25:06 -04:00
August
6c8f348fe6 Adds a sick jacket (#18662)
* Adds a sick jacket

battle jacket sprites and code for clothesdrobe

* Moved jacket to hacked vendor list

Moved jacket under hacked vendor inventory

* fixed colors

fixed color

* conflicts...

* merge plz?

* christ
2023-05-01 14:25:01 -04:00
Changelogs
4a92e4bf83 Automatic changelog compile [ci skip] 2023-05-01 14:07:22 +00:00
Yogbot-13
8ba1f8cdd5 Automatic changelog generation #18477 [ci skip] 2023-05-01 07:22:22 -04:00
SapphicOverload
9597a008f2 Energy Fire Axe (#18477)
* glory to atmosia

* Update twohanded.dm

* rest of engineering can have it too, as a treat

* i forgor

* guh

* sprite fix
2023-05-01 06:22:20 -05:00
Yogbot-13
8967c58ae9 Automatic changelog generation #18688 [ci skip] 2023-05-01 07:17:16 -04:00
airlines7
4f176e1325 Update ticker.dm (#18688) 2023-05-01 11:17:14 +00:00
Yogbot-13
fe1e1c0229 Automatic changelog generation #18618 [ci skip] 2023-05-01 07:16:57 -04:00
tattax
ea3a837731 adds different cuffs sprites to different huds (#18618)
* 1111

* 2

* test1
2023-05-01 06:16:55 -05:00
Yogbot-13
0adcab62c2 Automatic changelog generation #18658 [ci skip] 2023-05-01 07:15:37 -04:00
SapphicOverload
707a1d3439 Update pyrotechnics.dm (#18658) 2023-05-01 06:15:35 -05:00
Yogbot-13
39881f79a0 Automatic changelog generation #18651 [ci skip] 2023-05-01 07:13:31 -04:00
ynot01
395f22f7f6 Fix changeling monkeys, vampire bats, & vassal bats (#18651)
* bunch of buggies

* fix shapeshift instakilling
2023-05-01 06:13:28 -05:00
Yogbot-13
25b06bd548 Automatic changelog generation #18687 [ci skip] 2023-05-01 07:10:37 -04:00
Byemoh
2283d01665 You can now alt click ammo boxes/magazines to combine/take bullets (#18687)
* asdasdcqwcqw

* Revert "asdasdcqwcqw"

This reverts commit c481b6f670.

* Revert "Revert "asdasdcqwcqw""

This reverts commit 5c6e80b13e.

* Update _basemap.dm

* Update _box_magazine.dm
2023-05-01 06:10:35 -05:00
Yogbot-13
ec867c4109 Automatic changelog generation #18660 [ci skip] 2023-05-01 07:09:15 -04:00
August
0637edd121 Lizard mask variants (#18660)
* Progress so far

_masks.dm - create mutantrace_variation var
update_icons - Snout check and alternate mask overlay
species.dm - dont cut my nose off
mask.dmi - mask sprites
the rest - setting mutantrace_variation var for those that have it.

* Fixed masks not appearing

If a mask didnt have the mutantrace var set, it wouldnt appear at all. For some reason this only applies to gas masks, not breath masks.

* Remove clown / mime masks

I dont wanna go there so im not. Fixed dmi / code to match

* Fixed finally?

Fixed issues with snouts and masks layering improperly, and finished the rest of the sprites.

* fixing this discrepancy

yea

* changed layers in misc.dm

moved "head" and "facemask" layers above the "bodyfront" layer to fix issue with light snouts

* Update mask.dmi

fix dmi discrepancies

* argh

duplicate
2023-05-01 06:09:13 -05:00
Yogbot-13
2cc3ccccad Automatic changelog generation #18673 [ci skip] 2023-05-01 07:02:35 -04:00
azzzertyy
9ccf5925b1 Adds stamp washing machine fixes, adds cent com, mime & syndicate dyes. (#18673)
* adds stamp fixes

Adds fixes for cent com, mime & syndicate stamps.
Also fixes QM's stamp giving CMO jumpsuit because that happened somehow

* fix linter maybe

* fix linter really

* adds jumpskirt washes

whoever coded jumpskirts is evil

* adds gloves & bedsheets
2023-05-01 06:02:33 -05:00
Yogbot-13
10d15f3bf2 Automatic changelog generation #18689 [ci skip] 2023-05-01 07:01:07 -04:00
SapphicOverload
9149e72cb8 CQC chokehold is less effective against you if you don't breathe, plus special flavor text for IPCs (#18689)
* Update cqc.dm

* less effective instead of impossible
2023-05-01 06:01:04 -05:00
Changelogs
673bf61f97 Automatic changelog compile [ci skip] 2023-05-01 06:10:54 +00:00
Yogbot-13
9cfa1f935b Automatic changelog generation #18697 [ci skip] 2023-04-30 19:57:44 -04:00
Skrem_7
cc45638f93 kills special .38, adds rubber .38 (#18697) 2023-04-30 18:57:42 -05:00
ynot01
c67597c31e Patches an exploit that enables chaplains to spawn anything in the game into their hands (#18706)
* Update holy_weapons.dm

* Update holy_weapons.dm
2023-04-30 21:58:22 +02:00
Changelogs
37491cc8f3 Automatic changelog compile [ci skip] 2023-04-30 06:10:39 +00:00
Yogbot-13
0c7d93ffb2 Automatic changelog generation #18682 [ci skip] 2023-04-30 02:00:15 -04:00
ynot01
b2f117325c Update chameleon.dm (#18682) 2023-04-30 01:00:13 -05:00
Yogbot-13
fc2ab0d4a3 Automatic changelog generation #18684 [ci skip] 2023-04-30 01:59:49 -04:00
Skrem_7
3e72ec5c45 rounds != shells (#18684) 2023-04-30 00:59:46 -05:00
Yogbot-13
ac4c107510 Automatic changelog generation #18693 [ci skip] 2023-04-30 00:28:00 -04:00
Skrem_7
44b3e5b747 updates lwt and surplus carbine icons (#18693)
* updates lwt and surplus carbine icons

* makes the lwt mag look better

* makes lwt mag bigger

* whoops i left an image in here

* kills some ghost pixels

* delet mag
2023-04-30 00:27:57 -04:00
Yogbot-13
f1004a0564 Automatic changelog generation #18666 [ci skip] 2023-04-29 22:10:27 -04:00
SapphicOverload
76bfd37ff2 Fixes some clothing stuff, part 2: the lizardening (#18666)
* the lizardening

-digitigrade shoe alternatives now work in any outfit instead of just job outfits
-adds magic footwraps for wizards because the wizard dying to glass shards is boring
-makes certain suits not look weird on lizards (witch hunter suit, cultist robes, armored greatcoat, padded german coat, wizard robes)
-makes a few hats not look weird on lizards (witch hunter hat, explorer hood, cultist robe hood)

* had to do all this manually

* why was this here

* that should be all

* L + merge conflict

* techpriest
2023-04-29 22:10:24 -04:00
Changelogs
68b5c1be84 Automatic changelog compile [ci skip] 2023-04-29 22:14:39 +00:00
Yogbot-13
d9b5ae434a Automatic changelog generation #18650 [ci skip] 2023-04-29 14:09:34 -04:00
Byemoh
319871481b bye (#18650) 2023-04-29 13:09:30 -05:00
Changelogs
51d468c146 Automatic changelog compile [ci skip] 2023-04-29 06:09:41 +00:00
Yogbot-13
4807943423 Automatic changelog generation #18665 [ci skip] 2023-04-29 00:48:31 -04:00
solwashere
d119fd76dd [BOX] CMO office changes (#18665)
* cmo office changes

* expands office location, adds anesthetic tank and surgery computer

* adds second shutters button and holosign button

* holosign
2023-04-28 23:48:28 -05:00
Changelogs
ed48a9a020 Automatic changelog compile [ci skip] 2023-04-28 22:15:24 +00:00
Yogbot-13
ebd661d708 Automatic changelog generation #18539 [ci skip] 2023-04-28 16:34:44 -04:00
Byemoh
8df1a23958 [ASTEROID] Replaces Hydroponics setup with DA WIENER (#18539)
* ass

* eeeeeeeee

* conflixc
2023-04-28 16:34:41 -04:00
Yogbot-13
e67281c015 Automatic changelog generation #18347 [ci skip] 2023-04-28 14:15:22 -04:00
Byemoh
f391d69f8b [GAX] Open Air Bar (#18347)
* eeee

* e

* missing pipe

* piping
2023-04-28 13:15:20 -05:00
Changelogs
83d9bf5d42 Automatic changelog compile [ci skip] 2023-04-28 06:11:00 +00:00
Yogbot-13
0b965fd3a9 Automatic changelog generation #18671 [ci skip] 2023-04-27 18:28:16 -04:00
SapphicOverload
9fde1638ab woe, conservation of mass be upon ye (#18671) 2023-04-28 01:28:13 +03:00