Commit Graph

48509 Commits

Author SHA1 Message Date
Tlaltecuhtli 62cc2abb2d more vending fix (#46538)
* Update maps.txt

* small vendor fixes

* Update _vending.dm
2019-09-25 15:32:50 +02: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
RaveRadbury 63937d37ad Fixes pAI PDA list disappearance. (#46709) 2019-09-24 17:59:22 -04:00
Couls f5614b8ede Update eyes.dm (#46717) 2019-09-24 17:58:10 -04:00
nemvar 5c49cc4968 Fixes tesla projectile chain (#46693) 2019-09-24 17:53:30 -04:00
MacBlaze1 726c79bb96 Turret fix fixes, fixes stationary AI, upload turrets not shooting heads. (#46637)
* Update portable_turret.dm

* Update portable_turret.dm

* Update portable_turret.dm

* less iterations and space usage

* spacing dammit

* Update portable_turret.dm

* wew

* Update portable_turret.dm

* hmmm

* wew

* Update portable_turret.dm
2019-09-24 17:53:16 -04:00
kingofkosmos 9a91a408e1 Personal combat messages (#46388)
* Makes all combat involved visible_messages in species.dm ignore user and adds a new to_chat-message for user alone.

* Adds personal combat messages to martial arts.

* Adds personal combat messages to most things, like monkeys, aliens, humanoids and silicons.

* Fixed message to bite src, not self

* Fixed message to attack src, not self

* Changes wording on miss-messages.

* Adds audible messages to visible_messages. Also adds few missing to_chats.
2019-09-24 17:46:47 -04:00
Qustinnus dfcd1c3b11 Tests the roulette wheel for 150 hours (fixes it) (#46655)
* fix

fix

* wires

* unepic commit

* desc

* exact bet

* fix
2019-09-24 18:23:02 +02: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
ATH1909 b155ac49b8 Fixes the narcolepsy symptom (#46684)
* Update narcolepsy.dm

* Update confusion.dm
2019-09-24 08:23:55 -04:00
Sneeker134 83ffac0be8 Butterbear (#46583)
* Created the almighty BUTTERBEAR!!!

* Fixed a subcategory issue.

* Added sound effect to slip, heavily nerfed duration of knockdown

* Changed default name of mob

Trademarked name I guess was a bad idea, but the suggested name is pretty good!

Co-Authored-By: MrDoomBringer <emmanuelssr@gmail.com>

* Balance changes

Bear attack damaged nerfed down to 1. Now is part of the russian faction. Slips now work 100% of the time, but you are unable to slip targets that are already prone.

* Had some indentation errors; oops!

* Less icky

Removed If Else loop for just an if

* Update old name

Co-Authored-By: MrDoomBringer <emmanuelssr@gmail.com>
2019-09-23 14:10:27 -07: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
Fikou 4112b890d6 xeno helmet now covers mouth and eyes (#46699) 2019-09-23 14:05:40 -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 cfc7a263ac fixes ert hardsuit sprites (#46694) 2019-09-23 13:59:28 -07:00
ATH1909 673ba39eb8 Black powder now makes plasmamen druggy (#46472)
* Update medicine_reagents.dm

* Update medicine_reagents.dm

* undoes an accidental change to master

* Update pyrotechnic_reagents.dm

* Update pyrotechnic_reagents.dm

* Update pyrotechnic_reagents.dm
2019-09-23 15:26:15 -04:00
Couls 6a9af259e9 Update ed209bot.dm (#46708) 2019-09-23 02:01:50 -04:00
oranges 0f2bb6a1ab Merge pull request #46512 from ExcessiveUseOfCobblestone/chicken-tendie-woundies
Cobbduceus: TW Changes (Missing HP Bonus/ Less Base Healing/ Less Penalty for Clothes)
2019-09-23 12:50:09 +12:00
skoglol d64e86ce08 Dynamic now auto-deadmin friendly. (#46698) 2019-09-22 18:02:08 -04:00
JJRcop bc9e28a523 Fix brain damage not giving traumas (#46582)
Fixes #46227
2019-09-22 20:54:04 +02:00
zxaber 41e38a4985 Adds the ability to swap scanners and caps on mechs after they've been completed. (#46579)
* stuff

Cause I guess I can't live with not having an active PR

* part 2
2019-09-22 20:51:52 +02:00
Rob Bailey 31a8f62875 Changes some legacy movespeed systems to modifier movespeed (#46334)
* Some migrated movespeed changes (+9 squashed commit)

Squashed commit:

[1feabda2b4] temperature fix

[f2e851b32b] hunger slowdown fixes

[7988aab191] damage modifier fixes

[7ceb081c5e] fixes

[8a47f36f41] fixes

[29b06afdaa] damage slowdown

[99397f4f9e] hungry

[90c20b828e] cold

[53d568b9fb] fat

* fixes ethereal code

* refactors and fixes

* different damage handling

* yes

* another
2019-09-22 20:05:19 +02:00
Qustinnus 8c15cc9bf1 fix (#46634)
f
2019-09-22 03:10:14 -07:00
Archemagus c690b4595a Сonfig paths standardization (#46648) 2019-09-22 03:07:32 -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
Time-Green 7aff176c9c Fixes floating point errors in plumbing (#46448)
* fixes floating point error and get_chem_id

* Fixes excessive floating point errors in plumbing

* unfucko wokie my disgusting attempt at conflict solving
2019-09-21 18:46:37 +02:00
AarontheIdiot acf9097741 Hepatectomy Surgery (#46397)
* healies ?

* balance

* fixed some oopsies

* no more ishuman

* newbie coder moments
2019-09-21 00:46:03 -04:00
Rob Bailey 0e2562f2a3 [READY]Scrooge McDuck'ing it! Money bag resprites. (#46498)
* New sprites!

* Makes hybrid the main sprite & prob(20) alt sprite
2019-09-20 15:16:36 -07:00
William Wallace ed9f8a265b Revert "Give blood brothers traitor HUD (#45295)" (#46562)
This reverts commit c914d556c1.
2019-09-20 15:12:05 -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
Rob Bailey 4e22d10e1f Logs canister label changing (#46589) 2019-09-20 14:55:57 -07:00
spookydonut 0074303964 [HOTFIX] fix conveyorbelt icons (#46575) 2019-09-20 14:55:31 -07:00
Arkatos1 062b55a0a8 Small demon refactor (#46509)
* Slaughter Demon refactor

* Review fixes

* Review fixes 2

* Code review fixes 3
2019-09-20 14:54:23 -07:00
kopoba e00da503ab Miners jumpsuits now got some fireprotection just like CE suit (#46534) 2019-09-20 14:52:01 -07:00
nemvar 32883908ed Critical changes (#46636) 2019-09-20 16:33:49 -04:00
ATH1909 cce12b5083 Yet another c2 chem rebalance (#46481)
* Update medicine_reagents.dm

* Update medicine_reagents.dm

* undoes an accidental change to master

* Update cat2_medicine_reagents.dm

* Update medicine_reagents.dm

* Update food_reagents.dm

* Update food_reagents.dm

* Update cat2_medicine_reagents.dm
2019-09-20 16:20:10 -04: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
ATH1909 eaa00b8744 Reworks the DAS symptom (#46347)
* Update genetics.dm

* Update dna.dm

* Update genetics.dm

* Update genetics.dm

* Update genetics.dm

* Update genetics.dm

* Update genetics.dm

* Update genetics.dm

* Update genetics.dm

* Update dna.dm

* Update genetics.dm

* Update genetics.dm

* Update dna.dm

* Update genetics.dm

* Update genetics.dm

* Update genetics.dm

* Update genetics.dm

* Update dna.dm

* Update genetics.dm

* Update code/datums/diseases/advance/symptoms/genetics.dm

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

* Update genetics.dm

* Update genetics.dm

* Update dna.dm
2019-09-20 09:59:54 +02:00
Fikou ec4280f597 fixes antag token vendor sprite and kinda fixes cargo exports text (#46616)
* ye

* oop
2019-09-20 02:07:30 -04:00
Mike Long 582c7923a7 Sleeping is now improved if you have a bedsheet. Sleeping also now helps recover stamina regardless of injury level. (#46550) 2019-09-18 12:11:33 -04:00
oranges dfe8da7c5d Merge pull request #46605 from actioninja/somedefineautodocs
bunch of define autodocs
2019-09-19 00:03:19 +12: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
oranges 83440d85c7 User input can no longer set the browse window name for paper (#46580)
This was using a user managed input, and in the case of the input being
html encoded < and > this was breaking goon chat (by appearing to
possibly browse the html to goonchat, instead of it's own window)

Using an md5 encoded version of the name removes any possibility of
exploit and fixes the reported issue
2019-09-18 07:22:47 +02:00