Commit Graph

5512 Commits

Author SHA1 Message Date
Useroth
29c7533a8b Merge pull request #35 from Skyrat-SS13/upstream-merge-52374
[MIRROR] Quirk waits for client before setting preferences
2020-07-23 15:16:02 +02:00
Useroth
40df423aa3 Merge pull request #31 from Skyrat-SS13/upstream-merge-52370
[MIRROR] We want medical text on quirks
2020-07-23 15:01:30 +02:00
NightRed
852c8022ef Quirk waits for client before setting preferences (#52374)
* moved from timer to on process check

* lets do that better

* bitflag cleanup

* signal is better still

* Update code/datums/traits/_quirk.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/datums/traits/_quirk.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* fixed comment

* Better doc text

* nicer still

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-22 23:46:50 -04:00
NightRed
e3e089baab We want medical text (#52370) 2020-07-22 18:34:55 -04:00
Couls
dc5840dc4e keybind signal support, ported from TGMC (#52219)
* keybind signal support, ported from TGMC

* Thank you linter

* remove unused and extra defines

* move signal defines up and fix emote keybind runtimes

* Apply suggestions

* Update keybinding.dm

* Missed this one in the upstream merge

* Ignore keybindings without names

* back to the OG

* Update living.dm

* Update living.dm

* got it

* trailing newline

* Update code/datums/keybinding/living.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-22 16:53:27 -04:00
skoglol
f5cd45f7f7 Removes forcesay on attack (#52341) 2020-07-22 04:30:30 -04:00
skoglol
0d85dc20eb Merge pull request #52304 from Ryll-Ryll/fixing-under-protest
Fixes handi-capable tackling from beyond the grave
2020-07-21 19:25:51 +02:00
skoglol
983b1f2f33 Merge pull request #52369 from nightred/heirloom
Clear family heirloom moods on removal
2020-07-21 19:18:25 +02:00
skoglol
77d73a6518 Merge pull request #52338 from ShizCalev/fixes-coma-runtime
Fixes coma runtime
2020-07-21 17:49:20 +02:00
ShizCalev
4b6500fb67 Makes all anchored changes use setAnchored(), COMSIG_MOVABLE_SETANCHORED now only sent if an AM's anchored var has changed for more reliable usage. (#52254)
* Converts everything to use setAnchored() + other fixes

* Fixed singulo debug

* singulo again

* forgot to move the vv_edit proc

* caught that this time :)

* changes

* Update code/game/atoms_movable.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-21 02:20:26 -03:00
Ryll-Ryll
f909ca0663 correct check 2020-07-20 23:25:31 -04:00
ArcaneMusic
911e702540 Adds a simple payment component, photocopiers now cost 5 credits to make copies each. (#51944)
* Take 1, initial mediocity

* Stonks

* I'm working on it don't stale me

* HOOOOOOO adjusts the photocopier, extends component functionality to the medical kiosk, etc etc/

* Fixes that one bug with printers.

* Removes an unused var.

* Makes defines

* I am a champion

* Moves econ defines over... econ defines.

* Forgot the comment.

* How about now?

* Accidently excluded payments from the dme.

* Slight text tweaks, also checkmark.

* updates economy defines.

* Apply suggestions from code review

Review Commits pre-cleanup

Co-authored-by: Rohesie <rohesie@gmail.com>

* Post-Fixes from review.

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-20 22:40:59 -03:00
RaveRadbury
11fda03cc4 Insect phobia (#52261)
* Add insect phobia

applies to moths, flies, and cockroaches

* Adds bee content
2020-07-20 18:27:55 -03:00
zxaber
87a3a7174b Fixes hulk arms breaking when punching non walls (#52250)
* fixes an oversight with hulk recoil

* locating a better solution

* asdf

* condenced
2020-07-20 17:28:10 -03:00
skoglol
8f7bcf424f Runechat emotes (#52212)
* runechat emotes

* rename

* tweaks
2020-07-20 22:03:30 +02:00
Dennok
e54ac594de look_up tweak and look_down verb (#52139)
* look_down

look_down 
persistent  look_up and look_down

* look_down

look_down 
persistent  look_up and look_down

* Now look prefer a hole in front of the astronauts

* up

* up

* up

* up

* Update living.dm

* Update living.dm
2020-07-20 16:12:19 -03:00
nightred
b27331cbb0 Clear Family Heirloom mood on removal 2020-07-20 11:28:52 -05:00
MrMelbert
789aa2b6ba Adds an item proc for accidental consumption and implements it in food containers (bread, cake, cheese) (#51925)
* cronch monch ow, i'm dyin bros

* oopsies

* also should've removed that

* first round of fixes, thanks bros

* fk

* Some post cleanup

* ?

* if-else begone

* gotta sweep sweep sweep

* proper math

* Update code/modules/projectiles/ammunition/_ammunition.dm

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-07-20 09:40:46 -04:00
L
00d8f1da66 tweaks 2020-07-19 22:20:09 -03:00
L
9ee2907a68 runechat emotes 2020-07-19 22:11:44 -03:00
ShizCalev
50ee44a045 Fixes coma runtime 2020-07-19 04:41:23 -04:00
ArcaneMusic
c69cb714f2 You can now store mice in your chef's hat. (#52253)
* Is that a mouse in your chef's hat.

* yeah that sounds about right

* Sure thing boss.
2020-07-18 14:37:29 -04:00
LemonInTheDark
d3f9b70c0f Adds a message modification packet to saycode to allow for unordered parsing of operator chars, like ;, #, :, or % (#51790) 2020-07-18 18:18:23 +02:00
Ryll Ryll
53d1f1477d Adds hauberoaches, cockroaches wearing spiked helmets (#52161)
* done in under an hour

* sprite
2020-07-18 12:53:45 +02:00
Ryll Ryll
712898d713 webbit to do the incap check 2020-07-18 05:35:32 -04:00
Ryll-Ryll
60e3b6a67f changes buckling to buckled 2020-07-17 22:20:28 -04:00
Ryll-Ryll
1f31064c3e Merge remote-tracking branch 'tgstation/master' into who-named-this-damned-proc 2020-07-16 21:43:14 -04:00
Aleksej Komarov
0cf00a2645 tgui 4.0 (#52085)
* tgui 4.0 hyper squash

* Upgrade dependencies
2020-07-16 20:13:04 +02:00
jdawg1290
62676e72a8 Force LF line endings with gitattributes and convert repo (#52266)
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-07-16 03:02:40 +03:00
ATH1909
5cce5f87bd Finally adds a quickdraw hotkey for the suit storage slot (#52040) 2020-07-14 20:18:18 -04:00
ShizCalev
ccbd01386e Fixes another pellet cloud runtime (#52202) 2020-07-14 20:12:44 -04:00
EdgeLordExe
7cc4073b93 [READY] Addictions: 3 new drugs to show off a fun feature. (#51930)
* E

* EE

* AAA

* Update code/modules/reagents/chemistry/reagents/drug_reagents.dm

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>

* ee

* e

* e

* EE

* Apply suggestions from code review

Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents.dm

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* performance!

* E

* Update code/modules/reagents/chemistry/reagents/drug_reagents.dm

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* E

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-07-13 13:20:45 -04:00
skoglol
d513b14a58 Catatonics no longer get split personalities. (#52118)
* Catatonics no longer get split personalities.

* No switching to ssd either
2020-07-13 11:38:17 +02:00
LemonInTheDark
dbdb2d33fe Merge conflict begone 2020-07-12 17:37:14 -07:00
skoglol
3c30af5ddc Merge pull request #52020 from Ryll-Ryll/cronch
[READY] Vendors can tip on people thrown at them extra hard, lets you set ejection speed on disposal outlets
2020-07-12 13:59:38 +02:00
skoglol
06c5a7afdf Merge pull request #51854 from MrDoomBringer/supplyprettypod
Please check out this EPIC OFFICIAL PR TRAILER before reading (very important)
https://youtu.be/4RckVdx20oQ
the video is kinda autistic

dont forget to upvote
About The Pull Request

All sprites and epic meme videos made with love by yours truly
Except for the 2 missile sprites. Those were taken and modified from NSV13 who in turn ported them from TGMC
nupod_all_decals

Anyways, this adds:
New pod, reverse-pod, and target indicator sprites
Pod-ground collision effects (impact craters basically)
Cool looking vapor trails a la the half-life 2 headcrab shells

And also:
Fixes seethrough pods not actually working
Makes reverse-mode a bit more predictable
Has some minor code improvements with how supplypod-reverse-mode works
2020-07-12 13:24:37 +02:00
skoglol
aeaf321125 Merge pull request #51922 from Tlaltecuhtli/signaler-cobeyto
conveyor switches can now be actived with signalers
2020-07-12 13:02:08 +02:00
Ryll-Ryll
7f15be7f68 Merge branch 'master' into who-named-this-damned-proc 2020-07-11 23:30:49 -04:00
Ryll-Ryll
fc0b247738 rename 2020-07-11 23:23:23 -04:00
skoglol
bda6ca3e5b Removes megafauna teleport admin message (#52003)
* Removes megafauna teleport admin message

* doesnt actually work
2020-07-12 04:40:04 +10:00
AnturK
f4af5ed28c Makes CanReach default to blocking. (#52115) 2020-07-12 04:25:27 +10:00
Ryll Ryll
4a481bc861 Adds eye contact (#52108)
* doesn't do it for me

* signal and hijinx

* creep stare

* less lazy code
2020-07-12 03:39:57 +10:00
LemonInTheDark
f59207ec83 Converts rad_flags to flags_1, holy shit why 2020-07-09 00:20:46 -07:00
LemonInTheDark
c87583007f Splits TRAIT_RADIMMUNE into one trait that prevents radiation damage, and one that prevents genetic mutation TRAIT_GENELESS 2020-07-08 22:59:19 -07:00
ShizCalev
f4c54ccea4 Fixes mobs that aren't able to speak being able to cast spoken spells (#52054)
* Fixes wizard speaking

* defines
2020-07-08 19:25:39 +02:00
Jared-Fogle
418bd80a6b Remove healing skill (#52005)
* Remove healing skill

* Remove dissection from tech web
2020-07-07 10:10:12 -04:00
MrDoomBringer
719d3a1f45 first pass
WIP overlays


icon upd8


more


need to figure out whats going on with extractionpods


compile


the icon update


more!!


why are skillcapes broken


boat lmao


seethrough fix


Second drive-by


Code cleanup and improvements

Specifically surrounding contractor pods and reverse mode working properly
accidently left in an extra dmi whups


do the impossible see the invisible


new effect booster pack


MFW MRW Linter fail
2020-07-06 23:44:02 -04:00
ShizCalev
8447ce2847 MULEbot code cleanup & fixes (#51987)
cl ShizCalev
refactor: Optimized a good chunk of MULEbot code, fixing things such as it rebuilding it's overlays/icons 5 times every second while moving to a destination. Less free lag!
fix: Fixed MULEbots closing crates when the crate doesn't actually get loaded onto it.
fix: Fixed the maintenance hatch on MULEbots visually closing for a moment when emagged.
fix: Paranormal MULEbots will no longer briefly turn into a normal MULEbot when emagged.
fix: Fixed interface exploits involving paranormal MULEbots carrying ghosts.
fix: Fixed MULEbot blood tracks sometimes facing the wrong direction.
fix: Player controlled MULEbots will now leave bloody tracks if they've run over a mob.
fix: Fixed players riding MULEbots sometimes appearing underneath it instead of ontop of it.
fix: Fixed AI's making a chiming noise when they receive a remote notification from a MULEbot. Now only the AI will hear the notification's sound.
fix: Fixed MULEbots dropping mobs off at their current location instead of at their dropoff point.
fix: Fixed a minor runtime related to MULEbots dropping off deleted items/mobs.
fix: Fixed mobs having the wrong height offset when riding MULEbots.
fix: Fixed mobs sometimes ending up underneath MULEbots while riding them.
fix: Fixed mobs not falling off MULEbots when stunned / incapacitated.
fix: Fixed inducers not recharging MULEbots.
fix: Fixed MULEbots leaving bloody tracks in space.
fix: Fixed MULEbots leaving multiple blood tracks in the same spot if they failed to move.
fix: Fixed hacked MULEbots spamming messages about knocking down a mob when they didn't actually do it.
fix: Fixed MULEbot commands not resetting when they were turned off.
fix: Fixed MULEbots not turning off properly when their maintenance hatch is opened.
fix: Fixed MULEbots not turning off properly when they ran out of power while moving.
fix: Fixed MULEbots flashing their external warning lights while they're turned off when their avoidance wire is cut.
fix: Fixed mobs being able to walk right over MULEbots when they turn off.
fix: MULEbots will now try to put their powercell in your hands when you remove them with a crowbar.
fix: Fixed the interface for MULEbots briefly looking like you turned it on successfully even though it was out of power.
fix: MULEbots will now provide feedback if they fail to turn on due to their maintenance panel being open.
fix: MULEbots will no longer flash and beep when their wires are pulsed if they don't have power.
fix: MULEbots will now actually flash when their external warning lights are pulsed.
tweak: MULEbots will now flash when they beep / buzz.
add: Added a bit more examine text to MULEbots.
/cl

Fixes #42918
Fixes #46030
fixes #38594
2020-07-07 11:05:09 +12:00
skoglol
d32b69e83e Merge pull request #52002 from ShizCalev/riding-component-fix
fixes riding component check
2020-07-06 22:59:50 +02:00
Bobbahbrown
787d44e077 html moment (#51956) 2020-07-06 22:35:06 +02:00