Commit Graph

8750 Commits

Author SHA1 Message Date
ShizCalev
855e4b2f43 Merge pull request #52420 from ArcaneMusic/PaperCash
Paper cash stacks visually with it's value.
2020-07-24 20:57:30 -04:00
Ryll Ryll
46dd89b07a [READY] Wounds part 2: Piercing wounds, dismemberment changes, housekeeping (#51786)
* pierce the heavens

* starts doing projs

* continue pierce

* before armor

* before sharpness redefine

* rename sharp defines, before further implementation

* finishing undoing atk_type back to sharpness

* neatens up sharpness defines, FALSE -> SHARP_NONE

* more piercing, removes brute damage bleed, bubblegum no longer wound

* starts letting embeds get in on the fun

* half with embed

* work on dismembering

* continued embed work

* more moving bandaging to limbs

* more dismemberment work

* removing embed pierce stuff

* tweaking bullets

* more docs and work on dismemberment

* spans, piercing, guns

* dismemberment and scar fixes

* bee changes

* bullets embedding

* more bullet and dismember work

* dismemberment, surgery, piercing, formaldehyde,

* pleases travis

* pierce smite

* nicer on blood

* Auto stash before rebase of "tgstation/master"

* more neatening

* wounds only consider up to 35 damage, wounds on l6 and 762

* updates hulk

* balance

* defines

* lower slug to 50 brute to accommodate wounds

* adds differentiation for having flesh/bones/both in mobs

* moves scar descs to json, renames organic_state

* excises removed healing skill

* fixes logs, inconsistencies, some balance changes

* untab

* slight compress

* a

* kills pointed global list

* dmdoc

* halfway through roh

* finishes roh review

* okay NOW i finished roh's reviews

* roh roh roh your boat

* gently down the stream

* global lists

* list ops, fix scanner for bone gel improvised fix

* travis moment

* sounds added and moved

* pellet clouds can join the fun fully, slight gun balancing for wounds

* doc moment

* unconflicts myself

* update hulk

* Update code/_onclick/item_attack.dm

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

* crying ascii face

* final rohview

* oops

* final final

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-23 23:19:30 -03:00
NightRed
e0d88124e6 golden cooldown (#52410) 2020-07-23 23:18:25 -03:00
skoglol
82744898bb Merge pull request #52274 from ArcaneMusic/bepisv3
B.E.P.I.S. Version 2.0: Cargo Trimming
2020-07-23 17:59:47 +02:00
skoglol
5a655ccf3d Merge pull request #52383 from spookydonut/leadingslash
Fix leading slashes and turn on linting for it
2020-07-23 17:35:33 +02:00
ArcaneMusic
450c17042c Review comments. 2020-07-22 22:49:58 -04:00
ArcaneMusic
2456415f56 Paper cash stacks correctly. 2020-07-22 04:39:38 -04:00
skoglol
fa73ae9116 Removes forcesay on attack (#52341) 2020-07-22 05:29:41 -03:00
ArcaneMusic
14c2017470 Merge remote-tracking branch 'upstream/master' into bepisv3 2020-07-22 03:05:04 -04:00
spookydonut
be4f3a4ee8 detections 2020-07-22 14:57:20 +08: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
spookydonut
d17080167c Fix leading slashes and turn on linting for it 2020-07-21 13:02:04 +08:00
Mickyan
9bd9672153 Removed spraycan ability to paint any object (#52186)
* begone

* dont need this
2020-07-20 16:33:47 -03:00
skoglol
fab6a70587 Fixes arrhytmic knife (#52322) 2020-07-20 14:37:29 -04:00
ShizCalev
8fdb09fcfe Defibbing THICKMATERIAL fix (#52291) 2020-07-19 17:21:58 +02:00
ArcaneMusic
72b7c738af Arconomy 1.0: Final Stage Capitalism (#52007)
* Part 1: Arcane is challeneged to rewrite all of economy at 4am on a wednesday, accepts

* Miasma? DUNKED
Bounties? CHUNKED
Hotel? TRIVAGO

* End of day... 2? 3? lockdown has ruined me

* Day 3. I cannot unto bogdanoff. Send help.

* So far so good.

* Day 4, in the ghost house. I've resprited a beloved machine with soul in it. There is a chance, I am losing my mind. Sometimes I hear the words, "When is economy done, arcane", and I look over my shoulder, and oranges isn't there, because he lives in New Zeland. Probably.

* We'll throw the technodes and mapchanges in too.

* Okay lets keep this a friendly debug item then

* yeah on second thought lets not make a precision testing instrument on a 50% success ratio.

* Newscaster updates.

* TGUI Rebuild 1 start counting fokes

* Runtime BEGONE FROM ME, fckn typepaths

* Cleans up autodocs, and other areas

* Updates tgui because I feel nothing anymore

* Recompiling tgui for that green check

* dunks the whole mint out of the code, get that hothead outta here.

* Green checkmark daily update.

* Should be decent from here.

* Resolves machine_design conflict

* Rebuilds TGUI again for the epic pogs

* Sweeping changes 2: See additional changelog

* Haunting insurance plus changes the define comment.

* Rounded vending prices, made bounties appear on examine, polish

* Atmos tanks now specify their mole requirements.

* TGUI 4.0 Updated.

* ACTUALLY updates to TGUI 4.0 standards.

* ThE bUiLd DiFfErS fRoM oUrS

* Ah, I didn't see the testmerge get re-upped.

* TGUI Rebuild.

* Shuffles some security-assistant bounties around
2020-07-19 13:44:25 +02: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
Timberpoes
a24d6f5adb Exosuit Fabricator tgui Total Conversion - An Ode to Roboticists (#52073)
* First draft

* tgui interface bluescreen guards

* Preparing for cyborg module sub-categories

* The rest of the owl

* Stop duplicate say messgaes

* Implement interface handling for obstructed exits

* Pocket lint

* Documentation and misc. code cleanup

* Implement searching in interface

* tgui pocket lint and build

* Coding style consistency and changes. Rebuild tgui.

* Update default bitflags

* Address potential edge case bluescreen.

* orange man good

* Remove emag_act with obsolete functionality

* Standardise variable naming conventions

* tgui 4.0 update

* tgui 4.0 update

* Port a couple of usability improvements from concept branch.

* Fix new ui_act input.

* Actually fix new ui_act input

* Port some small improvements from concept branch.

* Rebuild tgui

* Made department of redundancy department redundant.

* Rebuild tgui.
2020-07-18 19:09:24 +03:00
skoglol
f87ed89865 Merge pull request #52263 from ShizCalev/jetpack-fix
Fixes runtime caused by a mob's client disconnecting while jetpacking around
2020-07-17 11:02:58 +02:00
Aleksej Komarov
0cf00a2645 tgui 4.0 (#52085)
* tgui 4.0 hyper squash

* Upgrade dependencies
2020-07-16 20:13:04 +02:00
ArcaneMusic
55272025f5 Circuit is now a cargo circuit. 2020-07-16 00:53:52 -04: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
ShizCalev
254536072e [s] sanity checks vv_edit_var() values (#52255)
cl ShizCalev
fix: Added some sanity checking for varedit values.
/cl
* sanity checks vv_edit_var() values

* this should be an or

* one more fix
2020-07-16 10:20:41 +12:00
ShizCalev
215e9a7d78 fixes wayfinding pinpointer synthesizer not returning initialize hint (#52225) 2020-07-15 16:15:14 -03:00
ShizCalev
e3dd82394b Fixes mobs that disconnect while using a jetpack continuing to boost around 2020-07-15 15:14:55 -04:00
skoglol
2f8a4793db Agent ID can no longer set IC banned words. (#52234) 2020-07-15 22:23:13 +08:00
ShizCalev
558a15df6a Improves feedback when tagging an area that's already tagged by your gang (#52205)
* Improves tagging feedback

* instead
2020-07-14 20:12:24 -04:00
LemonInTheDark
1c31dc43d5 Adds hot ice coffee (#52208) 2020-07-14 20:07:01 -04:00
LemonInTheDark
dbdb2d33fe Merge conflict begone 2020-07-12 17:37:14 -07:00
skoglol
5b0d4d17d4 Merge pull request #52062 from ShizCalev/stack-varedit-tweak
better stack amount varedit handling
2020-07-12 13:49:59 +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
7ec3849d63 Merge pull request #52158 from LemonInTheDark/help-me
Fixes acid/fire/blobs/a few other things touching objects below a tile
2020-07-12 11:56:26 +02:00
LordVollkorn
5fd23707d9 [READY] New Sprites and Icons to fix certain items (#52154)
* New icons and sprites

* DNA sample kit sprite

Co-authored-by: MrDoomBringer <mrdoomboyo@gmail.com>
2020-07-12 11:08:07 +02:00
AnturK
f4af5ed28c Makes CanReach default to blocking. (#52115) 2020-07-12 04:25:27 +10:00
LemonInTheDark
fce4274752 Fixes all bits of code that check if something is under a tile that weren't being done 2020-07-10 22:14:37 -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
ea9696341d fixes laserpointer runtime (#52074) 2020-07-08 10:27:04 -04:00
AnturK
bff0df0e8c [Ready?] Mech vs Mech combat system! ... (For toy mechs.) (#51817)
* Mech battle system!!

* suicide_act

* sounds

* a few checks here and there + comments

* polish

* restores a deleted attack_hand

* cleans up some indents

* incapacitated people can't have epic fights

* CONTRIBUTING.md compliance that i missed

* fixes doc, suicide, adds a sleep proc for ease

* fixes a minor sin + makes it pretty

* moved file

* anime

* "balancing"
2020-07-08 11:58:32 +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
LordVollkorn
e25c7bff77 HOTFIX: Fixed the wrong type of anomaly core (#52072)
About The Pull Request

The raw vortex anomaly core requirement is fixed so the device accepts proper vortex anomaly cores.
Changelog

🆑 Jay Smith
fix: The Portable Chemical Mixer now uses proper vortex anomaly cores instead of raw ones.
/🆑
2020-07-07 23:33:56 +12: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
c1a1aaa642 better stack amount varedit handling 2020-07-06 20:12:12 -04:00
LemonInTheDark
92209dd23a Sweeps up some rarely used and unbalanced sources of research points (#52012)
About The Pull Request

Removes the research point gen modes from tesla coils and rad collectors.
Someone is gonna take some flak for removing these at some point, may as well be me.
Why It's Good For The Game

THE DESIGN DOC DICTACT-

Nah powergen should be valid on it's own, it shouldn't need to rely on other econs to make it worth the work. We can try that later, but not now.
Changelog

cl
del: Removed the research modes from tesla coils and radiation collectors.
/cl
2020-07-07 11:02:33 +12:00
Jared-Fogle
8a380db379 Accurate donut box sprites (#51971)
The sprite of the donut box will now be dependent on what donuts are inside and in what order.

Current donut boxes misinform hungry spacemen, and colorful donut boxes are cool.
Changelog

cl
imageadd: Donut boxes will now accurately show what donuts are inside.
/cl
2020-07-07 10:56:25 +12:00
Orchian
d04c6f488d Occupational Corruption Device (#51884)
About The Pull Request

Adds a new traitor item exclusive to Heads of Personnel and Quartermasters that triggers a bureaucratic error
Why It's Good For The Game

Adds a new method for traitors to cause indirect havoc to the station at large
Changelog

cl
add: Added a new traitor item for HoP and QM, the OCD
/cl
2020-07-07 10:53:21 +12:00
ShizCalev
395271f4b4 [s] CRITICAL CRASH FIX. adds a check_tick to mass money insertion (#52059) 2020-07-06 19:50:10 -03:00
Bobbahbrown
787d44e077 html moment (#51956) 2020-07-06 22:35:06 +02:00
LordVollkorn
bc20090241 [READY] The Portable Chemical Mixer (#51964)
* New device: Portable Chemical Mixer

* Added entries to the tech web and the medical techfab

* removed unused icons for chemical cartridges

* small bugfix in build_path of portablechemicalmixer

* changed description and added info message

* Added newline

* Added a functioning newline

* Added a vortex anomaly core requirement

* Replaced old sorting method with sortBy

* Updated tgui.bundle to work with the latest code changes

* Added documentation to all variables and procs

* Small fix in wording

* Removed all non-class level documentation

* Updated tgui.bundle for the newest offical code version

* Updated tgui.bundle to work with the newest code version

* Updated the tgui.bundle to work with the newest version
2020-07-06 18:14:47 +03:00
KathyRyals
88cd751396 TGUI : Bluespace Locator edition (#52016)
* Initial commit

* Draft convert telebeacon code

* more ui_data code

* Woops

* Indent fix

* Prepare for compile, remove non-tgui code

* UNGA

* BluespaceLocator.js is born

* Initial TGUI UI commit.

* Spinning arrow, refactor code to components

* Tentative progress bar

* More UI tweaks

* More gui changes. Now display all beacons

* Tabify interface, overhaul looks, lint for the lint Gods

* Move logic from tgui to byond code

* Set default tab to implants.

* Rebuilt TGUI : Episode Three

* Rebuilt TGUI : Episode Four

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-07-06 17:58:05 +03:00
ArcaneMusic
eee922ee7f Updates vend-a-trays to have a unique UI, improves accessibility. (#51931)
* Initial commit, updates trays into 2020

* Adds vend-a-trays as a service machine, without it being a machine.

* Replaced the mapped vend-a-trays with service unique versions.

* "YoUr BuIlD DiFfErS fRoM mAsTeR"

* Removes {}s from img, workin on the other part

* All my homies recompile on merge conflict

* Fixes end of line because honestly there must be no god on this green earth

* hopefully this isn't too excessive.

* How's this?

* Applies Anturk's Confirm suggestion.

* Shipped, workshopped with style a bit

* Alright that's probably enough fiddling for now

* Rebuilds.
2020-07-06 11:37:06 +03:00