Commit Graph

29136 Commits

Author SHA1 Message Date
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
JJRcop
bc9e28a523 Fix brain damage not giving traumas (#46582)
Fixes #46227
2019-09-22 20:54:04 +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
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
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
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
Fikou
ec4280f597 fixes antag token vendor sprite and kinda fixes cargo exports text (#46616)
* ye

* oop
2019-09-20 02:07:30 -04: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
DeAndre
b3843b60a9 Makes hybrid the main sprite & prob(20) alt sprite 2019-09-18 01:41:09 +02: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
e776498833 Merge pull request #46560 from spookydonut/fuck
[HOTFIX] Fixes machine icons round start
2019-09-17 14:53:58 +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
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
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
Sneeker134
ee0acdd4e6 New Drink- Mauna Loa (#46539)
* Adds my new drink, Mauna Loa!

* Adds my new drink, Mauna Loa!

* Added the sprite to icons/obj/drinks.dmi

* Changes temperature change from 15 to 10, to match hellwater.

* Removed redundant ..() call.

* Fixed having wrong drink name

* Reducing reagents down to simplest form.

Co-Authored-By: Mickyan <38563876+Mickyan@users.noreply.github.com>

* Update drinks_recipes.dm

* Typo fixed and upped drink quality

* Spelling fixes, debuffs buffed

Even more typos pointed out (dang, I suck at English) and fixed, added firestacks so that the mob properly is set on fire on the proc and increased the probability to 5 from 1, increased temperature change from 10 to 25.
2019-09-16 14:21:14 -04:00
spookydonut
8c33746f53 fuck trying to safe cpu cycles i guess 2019-09-16 18:39:45 +08:00
nemvar
4accfec14e Arm implants work again (#46535) 2019-09-16 04:01:59 -04:00
nemvar
11c7f79b23 Pills no longer randomly sleep (#46504) 2019-09-16 01:57:05 -04:00
nemvar
3cd2dac44c MAGICDEFINES (#46506) 2019-09-16 01:56:23 -04:00
Arkatos1
7f486836b1 Pyrite fix (#46519) 2019-09-16 01:55:42 -04:00
Arkatos1
22c08b6c4a Robot camera fix (#46514) 2019-09-16 01:54:42 -04:00
Arkatos1
f7fa471b86 Uniform fixes (#46515)
* Curator uniform fix

* More uniforms fixes
2019-09-16 01:54:22 -04:00
ArcaneMusic
1e97c21bfb Fixes the Advanced Plasmacutter Inhand (#46528)
* Fixes the Advanced Plasmacutter Inhand

* 4th try now

* No wait I like datums please dont
2019-09-16 01:53:32 -04:00
spookydonut
68c8b71ae9 Changes power_change() to respect parent calls for toggling NOPOWER (#46486)
About The Pull Request

Similar to #46485
Now all relevant uses of power_change() call parent, theres a signal sent when a machine changes the NOPOWER flag, all remaining machines that were using power_change() instead of update_icon() have been fixed.
Why It's Good For The Game

code quality, eventually signal stuff. and signal stuff
2019-09-16 17:49:00 +12:00
spookydonut
62b3fffe3b Removes unneeded client checks on GLOB.player_list contents (#46445)
About The Pull Request

All mobs in GLOB.player_list have clients attached and there is in fact a fair amount of code that is working fine without checking client on things in player_list. This pr just removes a bunch of checks for client when iterating over player_list.
2019-09-16 16:48:50 +12:00
Names Are Hard
f764a3934a Adds a speech modifier to pAIs on EMP (#46411)
About The Pull Request

Makes it so pAIs either stutter, slur, or talk like a brainlet when they're EMPed. This can be fixed by someone pressing the "Reset speech synthesis module" button on the pAI card. Additionally, adds a 40% chance for their default language to be swapped.
Readded the mute, albeit a bit shorter, due to feedback.
Idea courtesy of Rogus.
image
Why It's Good For The Game

Mutes are boring. This adds a debuff that while less severe, persists for longer and requires the help of another player to fix.
Changelog

cl
tweak: pAI speech modules have been upgraded to be more EMP resistant, but they can now malfunction on EMP.
/cl
2019-09-16 16:48:25 +12:00
Fikou
0e7cc266c6 fixes floyds BAD THINGS (#46523)
About The Pull Request

gives knight armor and helm more fitting descs and names
fixes earth bolt name
makes knight armor actually show up in autolathe when you put the disk in instead of being in a nonexistent category
Why It's Good For The Game

fuck
Changelog

cl
fix: the knight armor and helmet now are in the imported category instead of some nonexistent one
spellcheck: earth bolt is no longer an earth_bolt
/cl
2019-09-16 16:47:37 +12:00