Commit Graph

9593 Commits

Author SHA1 Message Date
KT
e2435b7408 Nebulous Gas PR 2 Electric Bogaloo (#3735)
* Please dont break please

* How did I forget this

* Fixed hole in janitor's room, added corpo crates to warehouse

* Added Cryopod computers

* A few small touches here and there
2022-02-18 10:42:11 -08:00
silicons
3bcbedef4a Merge pull request #3739 from Citadel-Station-13/Lavaland-Fix
Fixes Lavaland
2022-02-18 04:10:29 -08:00
Captain277
09cfe7fe8f Plungers and Some Recipe Restoration 2022-02-17 19:20:21 -08:00
Changelogs
f8e641d973 Automatic changelog compile [ci skip] 2022-02-18 00:41:19 +00:00
Captain277
8d2b6087a0 Bows and Crafting 2022-02-17 13:35:55 -08:00
CitadelStationBot
4bc693f136 Automatic changelog generation for PR #3738 [ci skip] 2022-02-17 11:15:22 -06:00
silicons
5cd53131d0 Demotes xenobotanist/xenobiologist to alt titles of scientist (#3738)
* Update science.dm

* Update station_ids.dm
2022-02-17 09:15:19 -08:00
CitadelStationBot
37df87aef5 Automatic changelog generation for PR #3677 [ci skip] 2022-02-17 11:15:02 -06:00
Felix
7bc4479271 [RFM] Adherent alright (#3677)
* Basic Foundation for Adherent

Pain

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Corrects the Preview error

* Fixes the sprite, LETSSS GOOOOOOOO

* Part one of the species specific overlay shifter

* Adds a newline for linters

* Adds a newline for linters

* Adds a newline for linters

* Adds a newline for linters

* Adds a newline for linters

* LANGUAGE_GALCOM

* Gives Adherent flight, instead of permanent hover

* Bays on mob icons to for clothing pixelshifts

* Removes the attempt at pixelshifting for now,
needs to be done later

* restores get_mob_lay for accessories

* Hacks the clothing sprites away by removing -
all overlay

* adds the todo comment for the clothing issue

* Makes adherent external organs crystal

* Makes Adherent internal Organs crystaline

* Uncrystallises and recrystalises Adherent

* fixes Robotic and crystal checks

* Explaination on how to work with the defines

* crystalises the remaining Adherent parts

* Makes brittle a status rather than a condition

* postorgan rejuvenate correction

* Fixes mineral baths

* Removes the onmob icons that should be used for
bays on mob rendering

* Update adherent.dm

* removes the pointless proc Process()

* Gives Adherent native protocol

* removes the unneeded Verb assignments

* Renames the adherent language

* Reduces chargepylon damage to non adherents

* Makes the UI action buttons work

* Mineral baths fix system instability

* Coloration fix attempt partial progress.

* Comment to get the checks to run again

* changes adherent icobase

* Fresh tiles and cleared of clutter

tiles and shit emptied from the room, thanks, NT.

* Move over map and why was that AI pad there?

* WHO PUT THESE DECALS HERE?!

* Light bars for bulbs

* moved maint door, pipes, added adherent bath and bodyworks

* Comment to force checks

I hate you, Maintainers

* I hate me and my miss clicks, deleted two in wall firealarms

Co-authored-by: LordPapalus <lordpapalus@gmail.com>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Solaris-Shade <73904284+Solaris-Shade@users.noreply.github.com>
Co-authored-by: LordPapalus <54518057+LordPapalus@users.noreply.github.com>
2022-02-17 09:14:59 -08:00
Captain277
75ec9baa6c Bola Icon Update and Subtypes 2022-02-17 02:13:02 -08:00
Captain277
3afcd9c6e6 Fixes Lavaland Airlock and Turfs, Fixes Bolas 2022-02-17 00:02:46 -08:00
Captain277
1d71267d66 Bolas, Leather Drying Thing, Holster Crafting, and Lances 2022-02-16 20:06:32 -08:00
Changelogs
a383db5f59 Automatic changelog compile [ci skip] 2022-02-17 00:34:53 +00:00
Captain277
4c3d96cc84 Quick Conflict Adjustment 2022-02-16 15:41:30 -08:00
Captain277
b7e1365ffe Merge branch 'master' into Lavaland-Fix 2022-02-16 15:40:05 -08:00
Captain277
0fdbbec31e Drying Rack Stage 1 2022-02-16 15:39:29 -08:00
CitadelStationBot
3648ec1c3f Automatic changelog generation for PR #3732 [ci skip] 2022-02-16 17:38:08 -06:00
silicons
456a5e2ad7 Merge pull request #3732 from Citadel-Station-13/Butchery
Updates Our Harvest Procs to Provide Meat, Bone, Hide, and Exotic Drops for Crafting
2022-02-16 15:38:05 -08:00
Captain277
9be2c57b04 Goliath Cloak Fix 2022-02-16 12:55:36 -08:00
Captain277
bbab26f7e3 The Washing Machine fine tuning fix. 2022-02-16 12:29:44 -08:00
Captain277
c7d3c606b6 Washing Machine Fix 2022-02-16 12:14:08 -08:00
Captain277
43417d2a3a Adds one more fiftyspawner. 2022-02-16 11:48:26 -08:00
Captain277
80d4cc67bc Fixes IEDs and the bone material. 2022-02-16 11:31:33 -08:00
Captain277
70b0bdfd78 Icon Fix for Pneumo 2022-02-16 09:56:46 -08:00
Captain277
71cae21810 Ha ha, package wrap. 2022-02-16 08:49:38 -08:00
Captain277
a77f918cae Engine finalization. 2022-02-15 23:54:20 -08:00
Captain277
c25be4beb0 Freezing adjustment. 2022-02-15 23:40:16 -08:00
Captain277
02ecc6f975 Recipe fixes, leathercrafting fix. 2022-02-15 23:16:05 -08:00
Changelogs
fcca37ae34 Automatic changelog compile [ci skip] 2022-02-16 00:37:05 +00:00
Captain277
82e2ed3beb Fixes the fix. 2022-02-15 16:22:42 -08:00
CitadelStationBot
1264e64afe Automatic changelog generation for PR #3731 [ci skip] 2022-02-15 16:21:26 -06:00
Felix
09ef4c07f6 Weaver abilities from vore (#3731)
* Weaver abilities from vore

* new lines for linters

* Adds the weaver trait to positive traits

* more new lines I guess?
2022-02-15 14:21:24 -08:00
CitadelStationBot
84e510825c Automatic changelog generation for PR #3736 [ci skip] 2022-02-15 16:21:12 -06:00
Felix
59850c1450 Altclick interaction for Dice, borgs rejoice (#3736) 2022-02-15 14:21:09 -08:00
Captain277
7ffd491cd4 "Fix" 2022-02-15 14:20:23 -08:00
silicons
adcaa07821 Merge pull request #3728 from Citadel-Station-13/Stripper-Gun-Pref
Makes the Stripper Gun a Pref, a la Size Guns - Defaults Both to Off
2022-02-14 23:08:17 -08:00
Captain277
cab70d4424 Telebaton Fix 2022-02-14 23:03:56 -08:00
silicons
e2e8d0ea5c Update landable.dm (#3730) 2022-02-14 18:39:51 -08:00
silicons
a125297ed1 Update dice.dm (#3733) 2022-02-14 18:29:37 -08:00
Captain277
4f4fc833c7 IED and Duct Tape 2022-02-14 18:27:40 -08:00
Captain277
404a830a24 IED Fix 2022-02-13 19:31:42 -08:00
Changelogs
03bce1bbbe Automatic changelog compile [ci skip] 2022-02-14 00:35:19 +00:00
Captain277
8d513145ad Fixes some menu issues. 2022-02-13 15:00:55 -08:00
Captain277
def3e1028c Harvest Those Mats 2022-02-13 14:23:56 -08:00
CitadelStationBot
c40a01e9ae Automatic changelog generation for PR #3681 [ci skip] 2022-02-13 15:17:29 -06:00
silicons
62bd631d9f Merge pull request #3681 from FreeStylaLT/chimera_spellification
Xenochimera Update
2022-02-13 13:17:26 -08:00
CitadelStationBot
abad931c0e Automatic changelog generation for PR #3725 [ci skip] 2022-02-13 15:14:20 -06:00
silicons
f1a358736d Merge pull request #3725 from TheLordME/robocorpsmendfix
corpsemend for cyborgs
2022-02-13 13:14:18 -08:00
CitadelStationBot
8d8ebf5dd3 Automatic changelog generation for PR #3720 [ci skip] 2022-02-13 15:14:05 -06:00
silicons
b7bd2b77c1 Merge pull request #3720 from TheLordME/linebreaks_for_everyone
Linebreak your emotes up to 6 times now
2022-02-13 13:14:02 -08:00