Commit Graph

48488 Commits

Author SHA1 Message Date
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
actioninja eff325336a bunch of define autodocs 2019-09-17 20:42:38 -07:00
DeAndre b3843b60a9 Makes hybrid the main sprite & prob(20) alt sprite 2019-09-18 01:41:09 +02:00
ShizCalev 6aab8e1be6 Removes references to removed miracle ruin (#46565) 2019-09-17 16:02:54 -04:00
AnturK 06fd043ab6 Fixes adding antag huds to newplayers. (#46555) 2019-09-17 10:53:58 -04:00
Fikou 730d96ad06 bunch of datum mats stuff mostly related to coins (#46289)
adamantine and mythril are now datum mats (mythril still admin only), adamantine has 1.5 strength buff to whatever is made out of it, mythril adds rpg loot elements to whatever is made out of it
you can now put plastic, adamantine and mythril in the autolathe and coin mint
you can now put titanium in coin mint
switches a bunch of stuff in cargo exports, including mythril and plastic being worth cash money
coin code has been changed to datum mats, the custom sprites have been lost except for antag token
2019-09-17 10:50:32 -04:00
YoYoBatty dd318ca333 Logs canister label changing 2019-09-17 10:05:18 -04:00
James 4e10294706 Mining points are back (#46548)
* Mining points are back

* Adds back the shaft miner starter kit cargo pack
2019-09-17 07:48:25 +02:00
oranges 049bc92e81 Fix syntax error 2019-09-17 05:41:29 +00:00
oranges beb537f21b Stripped input call on pda message monitor (#46576) 2019-09-16 22:38:22 -07:00
nemvar 60d324d599 Prevent further logspam (#46503)
I added these stack_traces to check how much work would needed so these 
can be safely removed. Apparently it's way more work than I and 
probably anyone else would be willing to do. Lots of data is already 
collected so if someone wants to improve the situation, you can check 
the logs for it.
2019-09-16 19:57:42 -07:00
oranges e776498833 Merge pull request #46560 from spookydonut/fuck
[HOTFIX] Fixes machine icons round start
2019-09-17 14:53:58 +12:00
Rob Bailey 07070d6f3b Crowbar fix but properly this time (#46570)
* powertool fix

* adds a missing return
2019-09-17 14:00:25 +12:00
carlarctg 9f66c34cd9 Adds Energy Cake & Cakehat Tweaks (#46381)
* energy cake

* wrong file

* zot

* ow

* merge goneflict

* Update food_reagents.dm

* the craftening

* merge come flict
2019-09-16 21:39:43 -04:00
Rob Bailey d590d0322f crowbarfix (#46568) 2019-09-16 18:21:47 -04:00
Mey-Ha-Zah 5ae7d4547e Updates Survival Medipen to use new Meds. (#46500)
During some gameplay I noticed Survival Medipens did a lot less healing. So I decided to code dive and find out why. After reading the file, I back check through all Pr's to find where it got removed and found it had been an undocumented change in #45105. I spoke with cobby and we came up with the amount and the additions to the pen.
2019-09-16 17:05:16 -04:00
Qustinnus 72fe05f732 chain (#46563) 2019-09-16 14:34:43 -04:00
Michael Ashfield 62e6e73f6d Makes action figures small (#46542)
* rebase branch

* Revert "rebase branch"

This reverts commit 72e70fe8ccabfa6c750193a57beeec14b30a2533.

* Updated this old code to fork

* Makes action figures small

They are small!

* Revert "Updated this old code to fork"

This reverts commit 8c2269f211d4ae95f317f8491b7f1bfbce39a7b1.

* ai small now

* made figures small

i missed this, just made mechs small before

* smaller owl and griff
2019-09-16 14:31:26 -04:00
zxaber 0a73280344 Adds engiborg circuit manipulator and extra mediborg beaker holder as upgrades (#46286)
* stuff and things

* almost forgot this part

* oops

* small fixes
2019-09-16 14:28:45 -04:00
81Denton db1e4cfefb Adds MMI related logging (#46453)
* Adds MMI related logging

* h

* h
2019-09-16 14:24:14 -04:00
skoglol 426eb8e817 HEY! LISTEN! Gets rid of some active turfs. (#46505) 2019-09-16 14:22:41 -04:00