Commit Graph

29800 Commits

Author SHA1 Message Date
JDHoffmann
aed514b36e Corner case speedups for bola and bear trap (#48194)
* Update speed in dismemberment

* updates speed in Uncuff()

Used in freedom implants, cult stuff, etc.

* update speed after stripping other

makes changes to speed like removing someone's bear trap instant.

* update speed on handcuffs removed by Uncuff()
2019-12-12 00:17:46 -05:00
JDHoffmann3
8f492ac42f Vampires maintain blood level over bat form (#48203)
* Vampires maintain blood level over bat form

* Blood level tracked if damage tracked
2019-12-11 19:29:36 -05:00
Yenwodyah
05fcf92e62 Fixes legcuff slowdown (#48189)
* legcuffs fixed

* Fix for real this time
2019-12-11 15:44:04 -05:00
Yenwodyah
097dedcd1b Fix syndi hardsuit helmet mode slowdown (#48192) 2019-12-11 15:42:34 -05:00
ArcaneMusic
4024a1aa91 Finally fixes duct stacks so they can be recycled. (#48201) 2019-12-11 15:34:50 -05:00
Jordie
4cf3825ba9 Merge pull request #48191 from RaveRadbury/meat-donut-balance
Meat donut recipe balance
2019-12-11 22:49:08 +11:00
TheVekter
b13fff8cf5 Adds Chili con Carnival (#48195)
* Adds Chili con Carnival

* DO YOU LIKE IT? DO YOU LIKE IT, SCOTT?

* added sprite by Arcane

* hang on I need to un-fuck this

* Adds custom sprite by Arcane
2019-12-11 22:40:15 +11:00
RaveRadbury
1cfa1a66f3 Adds attack verb to baguette (#48187)
* Adds attackby to Baguette

Comes with three possible verbs

* Reduces attack verbs to "touche'd"

The French word for "touch". Used by the referee to declare that a touch has been made.
2019-12-11 22:06:41 +11:00
TheVekter
f874b66b76 Fixes TGUI crafting exception (#48209) 2019-12-11 04:20:47 +02:00
Rob Bailey
493a467cd0 tgui-next portable atmos (#48081)
* portable atmos stuff

* better titlecase handling

* Rebuild tgui
2019-12-11 04:14:04 +02:00
Rob Bailey
d49c8c63c7 Tgui-next pandemic (#48074)
* pandemic

* rebuild

* flatten object

* use the correct var derp

* lint fixes + rebuild

* Rebuild tgui
2019-12-11 04:00:36 +02:00
Ryll Ryll
beff318999 Adds a bunch of new achievements (#48094)
About The Pull Request

Now that achievements are open for adding again, adds 7 new misc achievements-

    Disk, Please!: As a nuclear operative, hold up the captain with a loaded rocket launcher. The captain must be conscious for it to count!
    My Watchlist Status is Not Important: Get reported to security and medical staff by displaying antisocial tendencies in a video game.
    I Was a Teenage Anarchist: Get killed by a vending machine falling on you.
    Mister Sandman: Kill someone by botching surgery while they're asleep
    A Bowl-d New World: Die to a toilet
    How Do I Switch Hands???: Hit yourself idiot
    One Lean, Mean, Cleaning Machine: Gaze upon a fully promoted cleanbot

Why It's Good For The Game

Adds more fun things to do for the gamer cred that aren't just killing things on lavaland
Changelog

cl Ryll/Shaps
add: A bunch of new achievements have been added! To name a few, there are achievements for holding up the captain with a rocket launcher as a nuclear operative, dying to inanimate objects, dying in a toilet, and getting watchlisted! Go do some dumb stuff!
/cl
2019-12-11 14:36:31 +13:00
Rob Bailey
cacb9e586f fixes a typo (#48181) 2019-12-10 10:43:08 +01:00
RaveRadbury
3aa6c87711 Snowcone polish (#48153)
About The Pull Request

Various aspects of snow cone code made me upset to look at.

    I have fixed some glaring spelling errors, changed descriptions to flow better and reduce redundancy.
    The unused kiwi snowcone is now for a Space Mountain Wind snowcone. (MLG)
    The Mime snow cone had a straw that looked terrible, made it 122 grey. There was also a stray pixel on it, that's gone.
    The honey snowcone now looks less like a clone of lemon, now renamed "amber", it functions for honey as well as apple.
    I removed water as an aspect of the recipe as that makes no sense, snowcones are literally shaved ice and syrup.
    pwrgame snowcones and clown snowcones had their reagents mismatched some reason, that's gone.
    The clown snowcone required clowntears but paid out laughter? That's just cruel. It's now equivalent to the mime snowcone.
    The soda snowcone was clearly intended to be a cola snowcone from the icon, but it was made with sodawater???
    I am literally reliving the trauma of this as I work out all the stuff I changed. RED AND BLUE snowcones were swapped and seriously what the heck.
    Comments state that snow cones inherit SUGAR as a stand in for JUNKFOOD yet some things had SUGAR|JUNKFOOD and that's not cool, removed.
    Fruit salad is made up entirely of citrus fruits, but you would just taste fruits???!!??? I'm dying???!!!??
    Added ice and water tastes to snow cones that were missing it
    Berry snowcones had 10 berry juice for some reason, reduced to 5

Why It's Good For The Game

Misspellings and awkward phrasings are immersion breaking. Incorrect reagent outputs are bad. Making a snowcone sodawater but it looks like cola??? What?

Snow cones should be more enjoyable to engage than this.
Changelog

cl
add: Space Mountain Wind Snowcones
tweak: snow cones do not require water to make
tweak: honey snow cones have more of an amber color
tweak: the mime snow cone has a grey straw so you can actually see it.
tweak: apple snow cones are also amber now
tweak: sodawater snow cones are actually Space Cola snow cones.
tweak: fruit salad snowcone tastes changed
tweak: mixed berry is now just berry
tweak: all snow cones can now taste of ice and water
tweak: clown snow cones recipe changed to require laughter, output 5u of their reagent like almost all other snow cones.
tweak: berry snow cones require and output 5u of berry juice
fix: clown and pwrgame snowcones now contain the appropriate reagents
fix: removed stray pixel on mime snowcone
spellcheck: Misspellings in snowcone titles and descriptions
/cl

I thought about processing ice into shaved ice with the grinder but we also make fried eggs on a table with egg, salt, and pepper so maybe I'll do that another day.
2019-12-10 20:59:30 +13:00
tralezab
b1b3859973 [READY] Drones die when trying to leave the derelict (#47966)
About The Pull Request

Drones self destruct when leaving the derelict (changing zlevels)
Why It's Good For The Game

This was requested by an admin. You can slap everything in someone's face to NOT LEAVE THE DERELICT, and they still will. So here.
Changelog

cl
admin: drones are no longer allowed to leave their station, they will die upon doing so
/cl
2019-12-10 20:55:39 +13:00
spookydonut
175439f63a Removes unreachable code (#48143)
About The Pull Request

As detected by SpaceManiac/SpacemanDMM#123
2019-12-10 20:52:13 +13:00
skoglol
10de2370cf New disarm intent suicide (#47902)
About The Pull Request

Adds a new disarm intent suicide. Fixes the intent logic, it will now run different suicides for disarm and grab. Added some ghostize that I overlooked last time.

https://streamable.com/ifx25
Why It's Good For The Game

Fixes, silly new content
Changelog

cl Skoglol
fix: All human intent suicides now work properly
add: New disarm intent suicide
/cl
2019-12-10 20:44:28 +13:00
RaveRadbury
8225688ad6 Meat donut uses cutlets
Used to use slabs.
2019-12-09 14:40:13 -08:00
MrPerson
e8ba7a1f68 Solar improvements (#48110)
Improves the code for the solar panels a lot. It's still pretty bad but to make it better I'd have to dive into powernets.

Solar panels visually rotate a full 360 degrees instead of being locked to ordinal directions only. In 513 this uses vis_contents, in 512 it uses a regular overlay that needs to be reset constantly.
Adds a signal from the sun SS when the sun moves.
Timed tracking is now measured in degrees per minute instead of degrees per hour.
2019-12-09 13:47:57 -05:00
Buggy123
4d013693f0 Replaces magic numbers on Staff of Storms with vars (#48165)
* Adds editable var to storm staff instead of magic number

* Removes more magic numbers from Staff of Storms

* Added clarifications
2019-12-09 10:18:13 -05:00
MrPerson
71a698c68e Adds a signal when an explosion happens (#48161) 2019-12-09 03:26:51 -05:00
spookydonut
6b5433eb23 Fixes new linter errors (#48126)
About The Pull Request

This fixes the errors raised by the new feature I'm adding to the linter: SpaceManiac/SpacemanDMM#119
2019-12-09 20:53:24 +13:00
Bobbahbrown
5273e96267 Cleanup of Hailer Masks (#48132)
About The Pull Request

I noticed that hailer mask code had some weird smells so I refactored some stuff. Please tell me if stuff is still smelly or I did a bad job.

primarily:

    DESTROYED big switch, replaced with datums as recommended by ninja + floyd
    DESTROYED references to world time and instead used timers and callbacks
    DESTROYED non-defined use of constants everywhere and made code more legible
    DESTROYED some uses of 0 for FALSE and 1 for TRUE

Why It's Good For The Game

fewer smells
Changelog

cl bobbahbrown
refactor: Removed some stinky smells from hailer mask code.
/cl
2019-12-09 20:48:45 +13:00
Fury McFlurry
6b0af0febe Adds three new moth wings/markings (#48129)
* Adds three new wing types, and markings. 

wings and markings match eachother.

* Adds wings, actually ™️

* Adds a single empty line to soothe the bot.
2019-12-08 21:51:05 +01:00
skoglol
11a5ff7ecf Limit local server nukedisk spam (#48144)
Stops updating weight of the lone op spawn if the event has already 
triggered, and wont show the admin messages if there is just a single 
client connected to the server. Behaviour on live servers pre event 
spawn should not be noticeably affected.
2019-12-08 01:15:21 -08:00
Rob Bailey
a90a158f4d Replaces some dumb usage of switch with simpler statements (#48138) 2019-12-07 11:38:17 -05:00
4dplanner
8342de8d7c Fix herald cloak hit reaction (#48139) 2019-12-07 11:35:36 -05:00
Angust
817789b95a Changed two occurrences of "rice" into "sugar" to make them use the sugar icon instead of the rice icon (#48148) 2019-12-07 11:28:57 -05:00
carshalash
1580964944 Hot coco is now made with milk as it should be (#48124)
Who the fuck make hot coco with water? Fuck you, we use milk on this station.

cl
fix: Makes Hot Coco actually consumable
/cl
2019-12-07 22:18:32 +13:00
Firecage
94c5676cca Updates energy resistance armour values on remaining armours and helmets. (#48067)
* Updates energy resistence on remaining armours.

* Changes Hardhat back to 10 energy armour value.
2019-12-07 00:08:54 +01:00
Loomin
192b64a285 BRIGHT LIGHTS (#48096) 2019-12-06 23:40:23 +01:00
Rob Bailey
88cb666fd2 Fixes some nanite issues (#48112)
* fixes boolean parameters

* fixes nanite extra setting copying

* better extra settings display in crowd controller

* actually copies

* actually actually copy

* d

* rebuild

* fix incorrect function definition being used
2019-12-06 15:16:31 +01:00
ShizCalev
8efa6479ce Adds cell deletion handling for stunbatons (#48108) 2019-12-06 12:20:24 +01:00
Krysonism
d5bca32d71 [READY]Da great American foods update. Many many hamberders, resprites and more! (#48050)
* sprites

*  fiesta

* new bugers, tweaks, bugfix

* ghost burger + boritos

* fiesta fix

* Chickens now drop chicken meat
2019-12-06 12:16:04 +01:00
nemvar
f87f7091aa Fixes lightgeist runtime (#48116)
* Silences lightgeist runtime

* Fixes it properly

* death instead of delete
2019-12-06 11:51:17 +01:00
skoglol
c815deb6ce Fixes some misused ghostize (#48121) 2019-12-05 18:05:00 +00:00
ShizCalev
c30dcf7d61 Fixes gun overlays not updating when the cell is deleted (#48107)
Fixes gun overlays not updating when the cell is deleted
2019-12-05 00:40:17 -08:00
Rob Bailey
798bbd3d99 [ready] Smooth-ish move rising: revengeance (#47817)
* Smooth movement

Squashed commit:

[870d550fff] updates a variable name to not shadow a parent variable

[65131a9a4b] redundant

[7c85f7b87e] override based pulling and pushing

[60a9760c4b] unnecessary when it's done via an override

[0a67dfb3cb] removes a redundant manual override

[7f25104fed] pushing

[2bfd9973eb] eh

[fca7155245] cast properly

[ad4b9ad8ab] compile fix

[c28fde4bfb] some wonkiness with pulling fixed

[0e028d30b3] buckling fix + finer rounding

[8f93df2bbe] dragging + buckling fixes

[1541e1ce78] small optimization

[bda72345dd] smoother movement

fix to dragging being fucky

vehicle fix

orbiter fix

eof newline

cleanup

comment cleanup

stupid hack

bunch of tweaks/hacks + 60 fps default oh god

potential fix for orbiter issues (in a shitty way)

early override for some cases

unset orbit

multiply instead of add offset

no

no more timescale scaling and higher multiplier

meant to include this in last commit

comment

* clamp to 6, 1.25 multiplier

* (poorly) fixed buckles not always propagating

* get rid of some debug prints whoops

* fixes an infinite loop

* syntax + update savefile instead of interpreting 0 different

* uuuh
2019-12-05 02:34:46 +00:00
TheVekter
bebdd863e0 TGUI-NEXT: Smoke Machine (#48115)
* Converts the Smoke Machine to tgui-next

* Whoops forgot to build

* refactored cringe-ass nae nae spaghetti code

* minor newline refactor

* rebuild
2019-12-04 17:43:07 -08:00
Arkatos1
1d6c2d7c19 tgui-next: Gravity Generator (#48082)
* Basic ui procs

* Basic tgui-next

* tgui-next gravity generator

* Review fixes

* Code cleanup

* rebuild
2019-12-04 14:58:22 -08:00
Aleksej Komarov
dd9332bdb5 Various tgui fixes (Chem Master/Dispenser, Air Alarm), small cleanup. (#48095)
* Fix icons and button layout in Chem Dispenser, minor cleanup

* Do not round volume in ChemMaster

* Stricter ESLint rules

* Rebuild tgui

* No jumpy air alarm layout because of minuscule presence of random gases.

* Holy shit linter did not detect a missing key
2019-12-04 14:44:28 -08:00
oranges
90970bb3eb Merge pull request #48100 from AnturK/antagclown_runtime
Fixes readding clown mutation on traitor mind moving out
2019-12-05 10:07:40 +13:00
Tlaltecuhtli
e63ebb94d9 adds plumbing machine that can grind/juice items (#47881)
cl
add: plumbing machine to grind/juice objects and put it on duct net
/cl
!! it doesnt move shit you need to add belts to feed it!!

sprite by arcanemagician
2019-12-05 09:56:35 +13:00
Ryll Ryll
75af862fee Buffs immersion, adds manual blinking and inhale/exhale checks (#47704)
* *blink *inhale *exhale *blink *inhale *blink *exhale

* rapidly blinks

* mass immersion

* how was that even working

* manual blinking today, manual breathing tomorrow

* b

* cleansed

* more neatening

* minus check

* Update code/modules/admin/verbs/randomverbs.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* un-nom's my code

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* un-nom's my code

* less
2019-12-04 16:02:42 +00:00
TheVekter
8258b98616 RCDs and RPDs can now be worn on the belt slot (#48104)
* Modified the RCD to fit on a belt, cleaned up some of the upgrade descriptions.

* reeeeee tabbing

* As above except RPD

* Added the same functionality for the Plumbing Constructor and RLD
2019-12-04 10:14:13 -05:00
skoglol
3e7139e12c The Start Now verb now has undo options (#47998)
* The Start Now verb now has a confirmation and undo options.

* Update code/modules/admin/admin.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>
2019-12-03 19:52:12 +00:00
ShizCalev
5e5d6ae72a Merge pull request #48099 from AnturK/visionsofclockcultpast
Fixes hallucination runtime.
2019-12-03 12:31:59 -05:00
ShizCalev
a4c31559bb Merge pull request #48098 from AnturK/cc_runtime
Fixes client colour runtime
2019-12-03 12:31:39 -05:00
Fel
66114ec098 Mortar and Pestle Fixes (#48086) 2019-12-02 17:34:20 -05:00
Tony
ad870b5f37 Buffs granibitaluri (#47981)
* buffs granibitaluri, renames it to acetaminophen, changes the recipe accordingly

* me spell good

* new combo prefix -phen

instabitaluri renamed to syniphen

hopefully got all the map instances

* shut up travis

* no more grilling

* restores SOUL comment and fixes dumb capitalization things
2019-12-02 17:06:44 -05:00