Commit Graph

12451 Commits

Author SHA1 Message Date
Fikou 714b0ae2f1 the power of the M E D I C A L W R E N C H now makes you glow (#46927)
* awoo

* awoo

* no awoo $50 fine
2019-10-08 23:21:08 +02: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
kingofkosmos 71644568b5 Personal interaction messages to simple animals (#46744)
* Adds attacktext2 and friendly2 messages for personal "you" messages in combat.

* Adds response_help2, response_disarm2 and response_harm2 -messages for interacting with simple animals. Also removes unnecessary, already inherited, ones.

* Small extra: Adds personal messages for gun firing.

* Adds personal messages to grabs and fixes shoe stealing messages.

* Fixes open someone else's internals valve pronoun.

* Replaces response_help --> response_help_continuous, response_help2 --> response_help_simple etc. Also adds autodoc to simple_animal.dm variables.
2019-10-07 21:18:42 +02:00
carlarctg d6210b95ce Adds fireproof masks, and tweaks flameproof atmos clothing (#46732)
* the masks

* the startups

* more touchies

* whoops

* actually this is useless

* that's better

* i made a whoopsie boopsie

* bullying is not okay

* should stop coding at 2 am, but i am being a hypcrite now
2019-10-07 10:55:22 -04:00
Rob Bailey b4c34c8b58 Tabling Rework (#46383)
* nutable

* more damage

* halved time

* louder + slightly different sound

* head slam + nerfed table damage

* martial art breaks table + headsmash damages table

* stamina boost to headsmash

* functional table crushing
2019-10-06 19:26:12 -04:00
Bobbahbrown 02c5751e3c Add galaxy lawyer suit (#46860)
Ports the corporate liaison galaxy suit from TGMC. Requested by 
Grantteen. Object sprites by Twaticus.

Washing a lawyer suit with a bluespace crystal or a telecrystal will 
dye the suit into an exciting galaxy suit variant. This also adds the 
DYE_SYNDICATE dye key to telecrystals, could be used for future PRs.
2019-10-06 11:46:41 -07:00
nemvar a148cae769 Kills obj/item/projectile in favour of obj/projectile (#46692)
* Kills obj/item/projectile in favour of obj/projectile

* Resolves conflicts properly

* fixes that one map

* it lives
2019-10-06 13:37:24 -04:00
MacBlaze1 3000418c4d Lenturi slowdown healing itchiyuri replacement chem (#46546)
* slowdown burn damage healing

Heals burn damage by the amount of slowdown you have. Every damage over 40 / 25 basically

* small indentation fix

* Update cat2_medicine_reagents.dm

* fixed undefines

* Update medical.dm

* adds sanity slowdown healing

more insane, more healing

* slowdown healing

* Update cat2_medicine_reagents.dm

* Update cat2_medicine_reagents.dm

* Update cat2_medicine_reagents.dm

* Update cat2_medicine_reagents.dm

* oops what an idiot i am

* design changes

* Update cat2_medicine_reagents.dm

* oops

* organ damage at the end of use

* merge conflict fix #1

* stomach damage from 2 to 0.5

* Update cat2_medicine_reagents.dm

* Update cat2_medicine_reagents.dm
2019-10-06 01:46:55 -04:00
carlarctg 88c6761316 Crayons have powder back, but it doesn't color anymore (#46715)
* cray

* things gatrg yrty rthh

* things fixed

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/other_reagents.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2019-10-06 01:38:16 -04:00
Twaticus 70b68366e4 More Carpets & Tables (#46850)
Ports carpets from TauCetiStation
Original PR: TauCetiStation/TauCetiClassic#2989
Adds tables to match the carpets

Carpets Good. Tables Good.
Changelog

cl
imageadd: 8 new carpets and fancy tables
add: exotic carpet crate
/cl
2019-10-06 18:09:16 +13:00
Qustinnus 26a95ac867 Re-adds room beauty without the negative moodlets (#46848)
* re-add

* epic

* fix

* epic
2019-10-05 22:47:49 -04:00
James f6b9818d23 Fix plasmaglass shards not welding to plasmaglass (#46859) 2019-10-05 13:35:02 -07:00
YoYoBatty a19c1bec3b Tesla code improvements and qdel checks (#46741)
Potentially stops machines from getting tesla zap multiple times which 
could result in explosions occuring dozens of times even when they've 
been deleted.
2019-10-05 13:18:53 -07:00
Fikou 05f0c2c1f3 adds the GRILL (#46844)
* a

* GRILL GANG

* sipp

* sip

* seep

* grug

* FSAIUGANOHNHOE

* bru

* a

* finish him

* compilies ^w^

* WOOO

* holy crap

* woo

* a

* h

* woo

* woo

* woo

* awoo

* aa

* aw shet

* heck you floyd

* at ath

* awo

* we like compiling code

* awo

* coal mat

* awoo

* aasdga

* a

* nice

* awoo

* awwoooooooooooooooooooooooo

* awoo

* spaceport bars

* grill gang

* aw

* awooo

* yee

* aw

* flod

* awoo

* awoo

* yesyesyyes

* a

* awoo

* holy sht

* h

* awoo

* awo

* aaaaaaaaa

* awoooooooooo

* awoo

* aw man

* honk

* well boys we did it

* oh mama mia

* ok cobby flushed

* awoo

* removes fun

* yeep

* i just said something

* vruh obama

* ye

* awoo

* awooooooo
2019-10-05 13:40:40 -04:00
Rob Bailey 8a87fc5065 update fix (#46832) 2019-10-05 18:48:54 +02:00
AnturK 5a0f57019c Event Arena Controller (#46746)
Event arena controller for you know what event.

TODO:

Turn lower/upper corner into just a/b and pick min/x/y
Unique HUD icon
2019-10-05 16:29:43 +13: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
Arkatos1 9928614ddc Three spawn(0) conversions (#46837)
* Spawn converts

* Review fixes

* Update code/modules/mob/living/simple_animal/bot/bot.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2019-10-03 15:35:27 -04:00
NikNakFlak c10dfbcde3 Adds a much needed pAI gameboy face sprite (#46839) 2019-10-03 12:15:42 -04:00
nemvar 83ca607511 Removes dead acid armor code. (#46782) 2019-10-03 02:37:46 -07:00
81Denton b1c7b0b23a Improved laser pointer logging (#46769) 2019-10-03 02:24:47 -07:00
subject217 ee94180e6f run_obj_armor copypaste removal part 2 (#46752)
* Removes outdated copypaste run_obj_armor behavior

Also removes some random behavior on camera and APCs that not only did not work but was added with zero justification in a refactor. No changes for players.

* screwdriver to wirecutters

forgot about this

* checks for broken
2019-10-03 02:23:35 -07:00
NoxVS 1be0b68ce8 Adds new chaplain armor to the armament beacon (#46734)
* Adds new chaplain armor

Uses admin only armor from (I believe) hand of god mode

* Fixes

Changes description and removes mouth covering
2019-10-03 02:21:56 -07:00
Firecage 3996aaa197 Lets Syndi Mediborgs and Syndi Engiborgs get some of the upgrades of normal Mediborgs and Engiborgs. (#46760) 2019-10-03 02:17:17 -07:00
nemvar daffaefb71 Switches out the three billion args of electrocute act for flags (#46564)
* Switches out the three billion args of electrocute act for flags

* Adds autodoc to electrocute flags, sets the boolean I removed and tries to fix the ed209 file

* tries to fix ed209 again

* Fixes 209 hopefully

* Finally fixes that darn file

* one final one to fix the diff

* Or i guess i'll just do it myself
2019-10-02 23:14:19 +02:00
skoglol a7b02fb6c7 Removes air mix tanks (#46480)
* Removes air mix tanks.

* and the maps.
2019-10-02 12:01:23 +02:00
81Denton 23123404f4 Chameleon projector exploit fixes (#46827)
* Stops Chameleon projectors from scanning stealth implant boxes

* Also stops holosign scanning

* Dab on mimes

* Replaces mime typepath checks with alpha/invisibility checks

* Alpha/invis checks

* Removes typepath check
2019-10-01 16:56:03 -04:00
Urumasi a6052138a9 Tweaks the iscatperson() helper to be in line with other helpers (#46771)
* Fixed iscatperson() helper

* Renamed iscatperson() to isfelind()

* Fixed bug after working on out of date branch

* Fix spelling mistake
2019-10-01 09:34:41 +02:00
ATH1909 d2dad9c298 Fixes borg buckling+searching on harm intent (#46622)
* Update medicine_reagents.dm

* Update medicine_reagents.dm

* undoes an accidental change to master

* Update robot.dm

* Update buckling.dm

* Update buckling.dm

* Update buckling.dm

* Update robot.dm

* Update buckling.dm

* Update robot.dm

* Update buckling.dm

* Update robot.dm

* Update buckling.dm

* Update robot.dm

* Update robot.dm

* Update buckling.dm

* Update buckling.dm

* Update robot.dm
2019-09-30 21:39:25 +02:00
81Denton 287f3e1ca0 AI combat software upgrade gives proper malf abilities (#46726) 2019-09-27 01:06:07 -07: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
Firecage b18e8ba52b Makes Plastitanium Windows deconstructable and children of Reinforced Windows. (#46679)
* Makes plastitanium windows children of reinforced windows.

* Unanchored variety isn't fully tooled in now.

* Path moved to plasma/reinforced/plastitanium

* Fixes a blunder about neglecting a mapping path change.
2019-09-25 18:25:48 -07:00
nemvar 1e5d052f37 Moves shield code out of human code. (#46653) 2019-09-25 18:24:10 -07:00
subject217 bd3bc5463b Removes irrelevant damage deflection code from secure_closets.dm (#46720)
Did I test it? No I didn't.
2019-09-25 16:46:17 -04:00
Fox McCloud 483f026a3d Fixes Adult Slimes Dealing No Damage (#46718) 2019-09-25 15:09:21 -04:00
spookydonut 210ba5c571 Adds linting for equipped() pickup() dropped() (#46614)
* lint some inventory procs

* lineends

* f

*  line end

* lineend

* fuck

* changes per review
2019-09-25 02:31:29 -07:00
ArcaneMusic ffebc59369 Adds a new medical machine, the Medical Kiosk. (#46676)
* Kiosk Troubleshooting.

* Working version, without user cost

* Cleanup, ready to PR now.

* adds the circuit to basic biotech node, unfucks dme

* Almost had the department payments done, don't copy paste kids

* Makes patient_status less useless.

* Added a depowered icon state, made sure it actually works

* Something is wrong with advanced functions

* using advanced parts now works correctly, fixed typos.

* Cleaned up some code, patient status now works correctly, brain damage works the same

* removed unused variable that i've given up on

* Allows for standard machine deconstruction, adds open sprite

* Defaults a return on attackby for deconstruction
2019-09-24 21:40:40 -04:00
Rob Bailey 7d7a1e72d9 Gun sound revamp (#46689)
* shitload of new sounds

* dme fix

* file fixes

* more file fixes

* more file fixes

* volume tweaks + better pistol sounds

* more new sounds + no through walls suppressed

* better suppressed

* more work

* pistol handling sounds

* small tweaks
2019-09-24 18:01:27 -04:00
spookydonut 8b339f7f94 creamed component (#46496)
* creamed component

* creamed no

* make use of unused sprites

* applies to all living

* params

* changes from review
2019-09-24 17:17:33 +02:00
bgare89 d89aba95d5 Fixes #46440 (#46661)
Also transfers old spears damage to new explosive spear. (Fixes plasma spears.)
2019-09-23 14:06:35 -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
Couls 71959af2f9 prevents fried foods from duplicating (#46593)
* stop fried foods from duplicating

* remove beach ball after attack

* get rid of trash var
2019-09-22 03:04:43 -07:00
nemvar 27dbe6cf0c Fixes proximity checks (#46652)
* Fixes proximity

* shock hand no longer calls parent

* actually lets just let it do what it does.
2019-09-22 03:03:45 -07:00
spookydonut 116958444b Replace some sleep()s with timers (#46631)
* replace some sleeps

* ooops callback typepath

* change per review
2019-09-22 03:01:32 -07:00
spookydonut 2f00e0caa7 Replaces some spawn()s with timers (#46629)
* removes some spawn calls

* fucking indents

* changes per review
2019-09-22 01:33:14 -07:00
Rob Bailey e25979b966 Merge pull request #46543 from carlarctg/its-curator-ok
laser pointer buff
2019-09-20 15:10:12 -07:00
Rob Bailey fc7a972ae6 Merge pull request #46549 from ATH1909/dragosteadintei
Pneumatic cannons now only fire one item per click by default
2019-09-20 15:01:40 -07:00
Surrealaser 2c50f842ba Medborg Crew Monitor Upgrade (#46598)
* Medborg Crew Monitor Upgrade

Adds the crew monitor to medborg upgrades.

Why This is Good for the Game: The important second part of the crew pinpointer; as a result, medborgs no longer have to glue themselves to fixed crew monitor consoles in order to do the paramedicine job they excel at, which is boring and lame.

* Update

Revised per request so that the crew monitor upgrade is integrated with the pin pointer.

* Debug removal

* Verb removal
2019-09-20 10:00:12 -04:00
Qustinnus 20397d59f1 [READY] Roulette wheels (#46418)
* Basic roulette interface

* at least it compiles

* roulette

* fixes jackpot sound

* beacon

* epic

* push

* Update code/game/machinery/roulette_machine.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* sprites and more audio

* color

* Woops

* epic

* wires

* sprite

* Nya mergies pwease OwO (#17)

* Moves style to .styl

* test

* Fixed

* da real shiet

* fix

* fix

* fixes

* woops

* assets

* stop github stop

* fix

* static

* nya (#18)
2019-09-20 12:21:49 +02: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