Commit Graph

1025 Commits

Author SHA1 Message Date
kevinz000
c91e19c442 Merge remote-tracking branch 'tgstation/master' into movespeed_modifiers_take_two 2020-01-11 22:17:04 -08:00
kevinz000
ce02e45ecb get rid of refactor tags 2020-01-11 22:12:07 -08:00
kevinz000
63d54e3e4f PAIN 2020-01-11 22:11:29 -08:00
Fhaxaris
c6759b6ceb Fixes all explicit occurrences of rand() being used incorrectly. (#48732)
It doesn't return non whole numbers just because you gave it a range of non whole numbers. So don't do that.
2020-01-12 00:20:38 -05:00
MrPerson
e22560a346 update_icon() improvements (#48669)
* update_icon() improvements

Fixes some update_icon() calls to properly call parent and use update_overlays() and update_icon_state().

The rest of obj/item fuck it

* Suggested fixes, also passes the linter

* I always forget . = ..() is faster than return ..() FOR SOME FUCKING REASON

* Actually this is better

* Signilzes datum/action to update its icon when its connected item does.
2020-01-11 23:46:43 -05:00
kevinz000
935817e607 a a a a a 2020-01-11 15:36:32 -08:00
skoglol
284c0fec72 Merge pull request #48702 from LudwigVonChesterfield/tactical_fix
Fixing a small typo in tactical.dm
2020-01-11 05:42:10 +01:00
kevinz000
46451e23ea move stuff 2020-01-10 07:27:44 -08:00
wesoda25
030303d952 Ethereals now discharge electricity if their charge is too high (#48573)
* if this works i will be happy

* :(

* explosion

* brutemod

* george melons
2020-01-10 23:14:41 +11:00
Dennok
a2fc1614a6 You do not lose the storage window on storage pickup. (#48685)
* do not lose the storage window on pickup

do not lose the storage window on pickup

* Keep update_actions()
2020-01-10 21:35:02 +11:00
kevinz000
bb95b2a870 changes 2020-01-09 19:13:30 -08:00
kevinz000
7e09ac0036 datums and shit 2020-01-09 18:55:16 -08:00
LudwigVonChesterfield
4bc7053b73 A small typo in tactical.dm allowed for a funny. 2020-01-10 00:32:04 +02:00
kevinz000
32be60459f living, not mob (#48655) 2020-01-08 18:16:35 -05:00
skoglol
1986466aa7 Fix converting riot shield subtypes to strobe shields (#48541)
Basically this would let you upgrade fake roman bucklers to fully 
fledged riot shields with a flash on them.

Also fixed some inconsistent list indentation.
2020-01-04 22:25:38 -08:00
skoglol
04880ca76c Merge pull request #48556 from ShizCalev/caltrop-fix
Caltrop / glass / lightbulb crossing fixes
2020-01-04 21:56:26 +01:00
Rob Bailey
ba876548f3 Revert "[ready] Smooth-ish move rising: revengeance" (#48156)
Reverts #47817

People are complaining about motion sickness and I don't know what the issue is.
2020-01-04 23:58:31 +13:00
ShizCalev
ea56f83e58 Caltrop / glass / lightbulb crossing fixes 2020-01-03 04:47:06 -05:00
swindly
ee056e6cba fixes check_contents blacklist check (#48520) 2020-01-02 14:53:09 -05:00
81Denton
557d5f3266 Merge pull request #48505 from ninjanomnom/waddle-element
Makes waddling an element
2020-01-01 17:19:17 +01:00
Emmett Gaines
c6e71c5384 Makes forced_gravity an element 2019-12-31 13:00:47 -05:00
Emmett Gaines
119c4ebca3 Makes waddling an element 2019-12-31 12:55:53 -05:00
ShizCalev
9f532650b3 Pin removal recipe turned into proper tool_act. Has examine message informing you that you can do the thing. Now plays proper tool sounds. (#48461)
* Pin removal recipe turned into proper tool_act. Has examine message informing you that you can do the thing. Now plays proper tool sounds.

* fixed message
2019-12-31 09:18:33 -05:00
Jordan Brown
6d50877333 Fix crafting (#48477)
Initializes the instance type list before attempting to add to it.
2019-12-31 11:53:32 +01:00
Jordan Brown
bed37b7bb2 Fixes Intellitater crafting deleting AIs (#48451)
* Adds safety requirement checking to crafting

/datum/crafting_recipe now has check_requirements() which will be called once item instances that will be used are collected. If this fails, the crafting will be aborted.

* Prevent populated AI cards from use in crafting.

- Overrides check_requirements for the aitater crafting_recipe, failing it if there is an AI present in the candidate card.
2019-12-29 13:20:45 -05:00
Emmett Gaines
8e775638d4 Fixes orbit component transfer runtime (#48379) 2019-12-27 10:30:28 -05:00
spookydonut
9ce2bdae8c COMPONENT_DUPE_SELECTIVE (#48021)
* COMPONENT_DUPE_SELECTIVE

* a

* changes per review

* webedit
2019-12-25 22:02:27 -08:00
swindly
0e2b4e1977 Adds logs as parts of bonfires and blacklists steel-caps from them (#48312)
* blacklists steel logs from bonfire

* adds logs as bonfire part
2019-12-21 16:43:36 +01:00
swindly
659778d115 Adds blacklist check for using crafting ingredients (#48311)
* adds blacklist check for craft ingredients

* Update code/datums/components/crafting/crafting.dm

Co-Authored-By: Jordan Brown <Cyberboss@users.noreply.github.com>

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2019-12-21 16:40:59 +01: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
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
MrPerson
63a6c6d38f Removes an unused global list (#48170) 2019-12-09 09:51:08 -05: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
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
Rob Bailey
044fd3f7ad TGUI-next Nanite Interface Overhaul + Dropdown component (#47972)
* Nanite TGUI-Next + Dropdown

nanite remote

program hub and better remote

fuck it let's make a dropdown component, time to die

DROPDOWN WORKING HOLY SHIT

more dropdown work

cleanup + fixes

new timer system

nanite work

jj

functional dropdown + final structure for backend, more refactor needed

dropdown being insane

oh my god dropdown actually works correctly for once

massive backend refactor

small fix + docs

dropdown optimizations + width

wip nanite cloud control

forgot it

cloud controller

bunch of work

final chamber console

nanite remotes

rebuild

small tweaks

rebuild after rebase

* fixes

* big refactor to useFrontend, use standard style

* whoops

* small changes

* rebuild

* small fixes and tweaks + documentation on dropdown and collapsible

* small tweak to programmer ui

* Cosmetic
2019-12-02 01:00:38 +02:00
IndieanaJones
5bfdfe5f42 [READY] Gold Slime Mob Reworks (#47858)
* Update goldgrub.dm

* Update basilisk.dm

* Update hivebot.dm

* Update skeleton.dm

* Update eyeballs.dm

* Update bear.dm

* Update riding.dm

* Update emote.dm

* Update tree.dm

* Update bees.dm

* Update frog.dm

* Add files via upload

* Update giant_spider.dm

* Update mimic.dm, carp.dm, netherworld.dm

* Adds newlines at the end of these so Travis smiles

* Fix Eyeballs on NarNar Shuttle

* Update crab.dm

* Update netherworld.dm

* Update goldgrub.dm

* Change how the Lightgeist heal works

* Update hivebot.dm and mimic.dm

* Update goldgrub.dm

* Update Riding.dm with the new knockdown instead of stun thing

* OK Travis

* Update Mob Files

* Update Mining Mob Files
2019-12-01 10:23:58 +01:00
Aleksej Komarov
085b30b519 tgui-next: useBackend edition (#48010)
* Initial useBackend implementation

* Lots of random ui shit

* Bulldozer

* Fix an infinite recursion

* Quotes

* Rebuild tgui
2019-11-30 04:15:57 -08:00
Jordie
2f440e4b21 Merge pull request #48044 from bluetshirtguy/SinewSkirtkilt
A watcher sinew Skirt/MANLY KILT accessory
2019-11-30 18:43:17 +11:00
skoglol
61e01d3ac0 Crafting recipe results blacklisted by default (#47852)
* Strobe shield cant be crafted from strobe shield

* Blacklists result by default.

* Doesnt blacklist reqs
2019-11-28 19:12:15 +01:00
Ryll Ryll
85de1066f0 Freeze! Adds holding people up with guns. (#47677)
About The Pull Request

Attacking someone with a gun at point blank with grab intent will now hold them at gunpoint. This means you will automatically shoot the target if they move or attack, though they're still free to rummage around in their (or your, if you continue standing next to them) inventory, speak (including using radios), and throw things. The shooter may roam around a 3 tile box radius without breaking the hold-up, allowing them to reposition themselves, though breaking visibility will break the hold-up. In addition, if you're several tiles away and they make a break for it, they may be able to dodge the projectile. Tactical choices!


For the first 3 seconds after the hold-up, any triggered reaction shot will deal normal damage.
Between 3-10 seconds after, any triggered reaction shot will deal double damage.
After 10 seconds, the reaction shot will deal 2.5x damage.

The ramp-up is to give weapons with weaker per-shot damage like disablers, laser guns, and the .38 the ability to be useful for arrests and stick ups, without affecting combat balance too much. If you got someone you're trying to kill to hold still for 2 seconds at point blank range, you may as well just keep shooting them rather than fiddle with holding them up. If you're gonna resist, it's best to do it quickly!

Lastly, if the shooter is attacked and takes damage from anything, they have a chance to flinch and fire in reaction. This is a 50% chance, unless they're hit in the arm holding the gun, in which case it's an 80% chance.

Why It's Good For The Game

Adds in mechanical backing for taking people hostage or being able to arrest people with the threat of violence rather than actually carrying out that violence. Trying to take hostages or hold people up right now will just get you immediately shove spammed mid-"DROP $500 OR FAILRP" unless the other person feels like playing along. This makes cooperating or risking getting shot an actual choice, increasing mechanical depth while also adding more roleplay potential.

Also yes, the target cuffing themselves will not trigger the reaction shot, so holding someone up, backing up, and throwing cuffs at them is a valid move.
2019-11-28 21:30:52 +13:00
cybersaber101
4de97787b1 Added A watcher sinew Skirt accesory
A kilt designed out of monster bits, pretty hardcore right?
It has the same protection as the other tribal accessories. crafted using 2 watcher sinew and one bones. Will show over any clothing or suit.
2019-11-28 00:23:20 -08:00
Buggy123
43ef5fb4b6 Fixes partial sentences when examining a radioactive object at a distance (#47835)
* Fixes partial sentences when examining a radioactive object

* Fixed missing period

* Fixed unintentional examine balance change
2019-11-25 16:10:36 +00:00
XDTM
cec90df582 Nanite timer rework and general code improvements (#47745) 2019-11-21 20:36:47 -08:00
Rob Bailey
525d39d9f1 uplink (#47727)
small tweaks

proper theme

search + input bar theming

properly functional input theme

rebuild
2019-11-21 04:46:55 +00:00
Rob Bailey
5d48301d0a Borg spinning no longer stuns. (#47866) 2019-11-20 06:29:45 +00:00
Emmett Gaines
5481515dff Removes the non bitflag slot defines (#47742)
Removes the non bitflag slot defines
2019-11-17 17:52:11 -08:00
ShizCalev
a0dcbb5768 Fixes runtime when cloudsyncing nanites without programs errors. (#47786) 2019-11-17 19:23:43 +01:00
Krysonism
738b4fcae7 Da bottle update. Empty glass bottles, bottle crafting, hooch & moonshine bottles. (#47696)
* bottle bottle bottle

* newline
2019-11-12 17:54:49 -05:00
Rob Bailey
220a894d21 crafting fix (#47730) 2019-11-12 17:18:20 +01:00