Commit Graph

321 Commits

Author SHA1 Message Date
TheVekter 9f18ec829d Adds bronze/"brass" sheets to the Sheet Snatcher's whitelist (#48141)
* Adds emag effects to the mini-nuke and meteor toys

* Reduces range of mini-meteor explosion

* Normal meteor toy doesn't break after one throw, emagged one does.

* 90% of the time I have no idea what the fuck I'm talking about

* Adds brass/bronze to the sheet snatcher's whitelist

* I have no idea how this keeps happening
2019-12-09 20:48:25 +01:00
Couls af0eb8e935 birdboat now chokes on plastic (#47551)
* birdboat now chokes on plastic

* update maps

* Update goose.dm

* cleanup and fixes

* more improvements, goose will eat any item with plastic now

* limit goose to only eating 10 food per turf

* End this nightmare

* more sanity

* Die in your own vomit you broken goose

Co-Authored-By: skoglol <33292112+kriskog@users.noreply.github.com>
2019-12-01 10:14:06 +01:00
skoglol 26d35b060c Debug outfit updates (#47923)
* New debug ID, cells in BRPED

* Debug glasses

* admin rcd
2019-11-30 03:54:57 -08:00
ATH1909 e6c123924a You can now exorcise possessed blades who are being undesirable (#47400)
* Update book.dm

* Update code/game/objects/items/storage/book.dm

Co-Authored-By: kingofkosmos <monggi@gmail.com>

* Update code/game/objects/items/storage/book.dm

Co-Authored-By: kingofkosmos <monggi@gmail.com>
2019-11-24 18:21:36 -05:00
Emmett Gaines 5481515dff Removes the non bitflag slot defines (#47742)
Removes the non bitflag slot defines
2019-11-17 17:52:11 -08:00
skoglol 7f9d26c06b Increased max weight of tool and medical belt (#47614) 2019-11-14 17:59:42 -05:00
skoglol f17265b267 Removes plumbing from the RPD (#47713)
* baby steps

* Removed plumbing from RPD
2019-11-13 02:54:28 -08:00
Firecage 87b1f56034 Re-organizes survival box code to be less horrendously ugly. (#47504)
* Adds clown and mime masks to their respective survival boxes, and re-organizes survival box code.

* Removes clown and mime masks from survival kits.
2019-11-03 01:49:35 -08:00
skoglol 43a41e35a7 Janitors start with holosigns again (#47513)
* Janitor start with holosign instead of barrier, barrier now only blocks carbons.

* And unconscious for the other ones too
2019-11-03 01:42:17 -08:00
Rohesie 9dd28d5180 ID fix (#47387) 2019-10-30 16:17:55 -07:00
Firecage 34427d9872 Some bags and belts can hold more stuff. (#47318) 2019-10-28 17:07:58 -04:00
carlarctg bfc9c6ba81 Fixes candy cigarettes (#47332)
About The Pull Request

haha am stoopido :)
i fucked up with candy cigarettes like an idiot and didn't test anything
candy cigs now look like candy cigs and dont ahve broken sprites
Why It's Good For The Game

bug xies good
Changelog

cl
fix: candy cigarettes don't have broken sprites anymore
/cl
2019-10-26 21:07:09 +13:00
Neo 89299dd989 fixes (#47355) 2019-10-25 16:42:32 -07:00
Arkatos1 dabba37db2 Chameleon sprite fixes (#47322) 2019-10-25 02:36:39 -07:00
skoglol 938e66f62c Adds sorting to most input() lists (#47117)
* Adds sorting to most input() lists.

* Sorted some global lists, added more input sorting

* Should now use correct sort everywhere.

* compiles

* Last fixes.
2019-10-22 04:28:42 -07:00
carlarctg fe65761c93 Candy cigarettes! + cig tweaks (#47143)
* Oh dude we got a fuckin coffee cheetos chickennnnnnnnnnnnn

* Update mask.dmi
2019-10-21 13:20:45 +11:00
Krysonism 59a0440acf Da white kit nerf update: sutures and regen mesh. (#47092)
* Base

* epic

* bandaid begone

* Documentation

* Bugmash

* Replaces bruise packs and ointment in on maps.

* Fixes for testmerge

* new line

* Dirty web

* Nasty webedit

* med suture is now a chemical recipe, adds cellulose reagent
2019-10-20 13:18:42 -04:00
Krysonism c71d3a45d7 Update code/game/objects/items/storage/fancy.dm
Co-Authored-By: 81Denton <32391752+81Denton@users.noreply.github.com>
2019-10-20 14:35:58 +02:00
DeAndre a9b1ada28c Merge branch 'master' into Somethingforthekids 2019-10-20 13:26:13 +02:00
Tony 2f8ef2f725 fixes not being able to access medical first aid kits inside a bag (#47155) 2019-10-19 21:42:17 -04:00
KomradeSpectre 9ff071af60 Clockcult Removal 2019 (#47057)
* Nanotrasen fires the Wave Motion Gun at the Clock Cult

* Fixes a random changelog appearing from the reebe void.

* Fixes a wrong type reference regarding the bronze sheets in the Lavaland Ruin for it.

* Fixes redundant cells after CC removal in ruin by populating them with varied ore chunks, or destruction clutter.

* why is it /obj/item/stack/sheet/metal but not /obj/item/stack/sheet/iron

* Fixes the lavaland ratvar ruin to have fluff variant structures of deleted shit it referenced instead what I thought was reasonable.
2019-10-15 10:13:41 +02:00
skoglol d735e0bf36 Yet another debug outfit update (#46982)
About The Pull Request

Less uranium in the material box due to radiation. Suit helmet has had geiger sound reduced to 0, and a manual geiger counter added to the box. Also added a death wand for easier and cleaner killing.
2019-10-13 16:55:39 +13:00
nemvar 62a02f09f1 Medanalyzers are now the tier 2 option for scanning people. (#46917)
About The Pull Request

Removes medical analyzers from medkits.
Removes the ability to print medical scanners from the autolathe.
Why It's Good For The Game

Medical analyzers are currently probably one of the common items in the game. Not only do mappers place them all over their maps but they are also in every medkits, which, funnily enough, are also fucking everywhere.

This leads me what I call the Cobb's Assortment of medical scanner quality:
Tier 1: Ghetto tier. Click your healthdoll, see if you burned for fingers on the kitchen plate.
Tier 2: Normal Analyzers. Somewhat restricted but still fairly common. Almost every department has one but you won't find on randomly in the hallways.
Tier 3: Advanced Analyzers: The shit medbay can print after research, nuff said.
Changelog

cl
balance: Removed health analyzers from medkits. Removed the ability to print health analyzers from autolathes.
/cl
2019-10-13 16:50:12 +13:00
William Wallace b59c809bd5 remove duplicate var definition in /obj/item/storage/toolbox 2019-10-08 23:23:09 +01:00
William Wallace d83ac45514 remove duplicate /obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle 2019-10-08 23:22:03 +01:00
Qustinnus a394ccdc2b Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)
removes materials list from items, uses custom_materials instead. This might introduce some bugs so we should testmerge this for a while (and Ill test stuff locally as much as I can)

this also adds material crafting to sheets. Test case being chairs. In the future we can add stuff like tables, walls, doors etc.

also applies materials to everything, with fixes, which can close #46299
2019-10-08 11:06:02 -04:00
DeAndre dab5e68aff fixes 2019-10-06 22:36:53 +02:00
Qustinnus 81c3d92129 Adds pick-up, drop and throw sounds for items. (#46677)
* finishes up

* adds sound volumes

* woops

* forgot to ctrl + s

* cloth

* smh

* done
2019-10-04 18:53:09 -04:00
skoglol d924308199 Updated the debug outfit (#46590)
* Updated the debug outfit

* retype, cleanup.

* requested changes

* less dumb
2019-09-26 16:06:21 -07:00
nemvar dc783795db Renames is_hot and is_sharp to get_temperature and get_sharpness (#46680) 2019-09-23 14:02:59 -07:00
nemvar 8cfe0f6467 Slightly improves visible and audible messages. (#46499)
* Doubtful improvement

* Switches out all the magic numbers with defines

* Thanks travis for finally finding a real error

* properly resolves some left over conflict
2019-09-18 12:52:18 +02:00
Twaticus a340fbac62 Inhand sprites for satchels (#46489)
* satchel satchel satchel satchel

* oops i did it again
2019-09-16 02:00:40 -04:00
Mickyan 4f95643e40 Adds an improved first aid kit for medical staff (#46393)
About The Pull Request

CMO and MDs start with a first aid kit with slightly increased capacity and basic surgery tools
Why It's Good For The Game

Doctors need tools for doctoring in the new medical landscape, also makes the starting medkit a bit more worth holding onto
Changelog

cl
add: Medical staff now spawns with a first aid kit with increased capacity and basic surgery tools
/cl
2019-09-14 09:37:20 +12:00
Rob Bailey d633bcb039 equip sounds (#46387)
* equip sounds

* small tweaks

* single quote filepaths
2019-09-11 15:37:42 -04:00
Trilbyspaceclone 65c270e5bf [Ready] Adds chameleon neckties (#46195)
* the tie

* The cloak

* Right TG dosnt have item_color
2019-09-02 23:50:22 -07:00
Rob Bailey 2029163d33 playsound vary boolean define conversion (#46254)
About The Pull Request

Converts every single usage of playsound's vary parameter to use the boolean define instead of 1 or 0. I'm tired of people copypasting the incorrect usage.
Also changes a couple of places where a list was picked from instead of using get_sfx internal calls

This was done via regex:
(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\)) to match 1
(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\)) to match 0
full sed commands:
/(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\))/\1TRUE\2/ 1 to TRUE
/(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\))/\1FALSE\2/ 0 to FALSE

I'm not very good with regex and these could probably be optimized, but they worked.
Why It's Good For The Game

Code usability
2019-08-30 18:45:20 +12:00
nemvar 1c01c44465 Fixes tray runtime (#46189) 2019-08-29 10:25:26 +02:00
penterwast 4dd1e53aa0 Purifying a soulstone removes blood cult status from its shades (#46133)
* Purify removes blood cult status

* Remove cult from new captured shades
2019-08-27 13:16:18 -04:00
kingofkosmos df1fecc58c Adds notice-span to visible_messages with no spans (#46044)
About The Pull Request

Adds 'notice' span class to all visible_messages which had no span class, making all those black messages blue.
Why It's Good For The Game

This should help differentiate action-messages from talking-messages in the chat. More actions will be blue, thus black talking-messages should pop out more.
2019-08-26 20:50:00 +12:00
Rob Bailey 26b04ede42 Obliterates item_color: new washing machine functionality edition (#45961)
About The Pull Request

Completely removes item_color and the clusterfuck of bad programming it caused.

In places where item_color was used for entirely unique purposes it was split off and renamed to a new var on that typepath only, or refactored so it wasn't needed

In places where item_color was used as a dye color, it was converted to the new dye_color var

In places where item_color was used as the worn overlay it was removed and instead now icon_state is always used as the clothing overlay.

A new mob_overlay_icon var was added for manually setting where the mob overlay icon path is for specific items.

Moved some mob overlay files relating to clothing to their own directory as well for organization purposes.

Totally refactors washing machines, instead of the horrible abortion that was iterating through the typepath it now uses a registry of dye results.

Some bonus functionality to come out of this:
the washing machine now supports arbitrary dye colors.
Why It's Good For The Game

It's been 4 years since the "this should be deprecated soonish" comment was added, and this var is a shitpile of confusion if you just trace the usage of it.
Changelog

cl
add: Washing machines now support arbitrary dye color
add: Washing machines now dye nearly every item.
refactor: lots of backend changes to clothing overlays, report any issues
/cl
2019-08-26 20:38:11 +12:00
oranges 40c2b7e103 Merge pull request #45976 from cacogen/plantbagcanholdplantgenedisks
Plant bags can now hold plant gene disks
2019-08-26 20:35:55 +12:00
tralezab aaca9360b8 [READY] LIZARD WINGS for the flight potion, flight potion no longer makes you new species (#46037)
* HEY RACISM GOT A SPRITE ACCESSORY FOR YA

* angel + dragonborn > givespeciesflight

* more review stuff

* last of the review stuff

* compile

* readds my fix

* Boolean numero uno

* Boolean numero dos
2019-08-24 00:11:25 -07:00
carlarctg bda590ec9f improvements! (#46075) 2019-08-23 16:34:41 -07:00
moo 7437be0a9a Cobbduceus Part 2/X: Medibot-chan Tends Your Wounds (#45953)
* meow

* fix var

* cursed

* Revert "cursed"

This reverts commit 249491cfc1c05e21f9650a2d8c109c13741067f5.

* simple anti-multibot
2019-08-23 04:16:34 -07:00
moo 74ed605cd7 Cobbduceus Part 1/X: Category Twos, Base(d) Healers (#45749)
* 150 hours

* it compiles guys

* PERF

* meta conflictor

* oldcabin

* Revert "meta conflictor"

This reverts commit 812343ca615e5b00711786be4413ce3301cfcc90.

* oldmeta

* TAKE 5000

* NAME THIS

Also redoes Multiver/Palletta

* FRICK U FIZ

* NERF PERF

* comment cringe

* Checks for restraints/incapacitated for ichiyuri

* URIKA

Removes Healing-Scaling of Ichiyuri, Nerfs Healing of Aiuri.

* organ

* please upvote this

* maps...

* Gives Instabitaluri a Brand Name

Oh wow it's synthflesh 😆

* Update cat2_medicine_reagents.dm

* what kinda characters is Krys using
2019-08-22 17:30:16 -07:00
nemvar d93f31f388 Removes airlock charges. (#45989)
* Removes airlock charges.

* stuff for the bundle

* formatting fix.

* Adds the sabotage bag
2019-08-20 09:47:06 -04:00
MMMiracles 5bf2bafdd8 Adds Capitalism Firing Pins (#45893)
* adds capitalism firing pin for late-stage capitalism

* purchase prompt so you can't bankrupt the captain with a rigged gun

* prompt spam check, cargo crates for pins, extra warning message for accepting payment but not having enough to pay out

* test stuff please ignore

* pay-per-shot system, alert instead of input, minor cleanup

* fuck off clown

* range check to prevent long-range purchasing
2019-08-19 22:56:06 -07:00
cacogen c4eed865c7 Plant bags can now hold plant gene disks
Useful for quickly loading the disk compartmentaliser with disks.
2019-08-17 12:21:33 +12:00
Akrilla 9ca37e9169 Contract rerolls and general enhancements (#45703)
* refactor wip

* rerolling and qol

* space not valid

* travis be nice

* comment?

* new tablet sprites

* Start on uplink screen

* new suit sprite

* paper

* merge conflict

* Auto stash before merge of "contract-reroll" and "tgstation/master"
2019-08-10 02:11:11 -07:00
Michael Ashfield 8e3ace7e6f Plasmamen get plasma in their box (#45538)
* rebase branch

* Revert "rebase branch"

This reverts commit 72e70fe8ccabfa6c750193a57beeec14b30a2533.

* Updated this old code to fork

* gives the clown hugbox

* Clown gets hugbox back

* Removed new boxes, changed box code

* Sorted line spaces

* Removed sauce
2019-08-06 15:13:19 -04:00