Commit Graph
295 Commits
Author SHA1 Message Date
Firecage e5b3cb208f Clown cars will no longer be able to float over chasms. 2020-06-15 00:01:16 +02:00
yoriiandGitHub 549303e10a fix lavaboat oars 2020-06-13 04:24:46 +02:00
TlaltecuhtliandGitHub 3249114856 sex-sex-sex-sex-sex-sex-sex- (#51430) 2020-06-09 22:13:03 +02:00
nemvarandGitHub 6ef421be42 Renames a few variables. Also reorders icon fallback order again. (#51060)
* Renames a few variables. Also reorders fallback order again.
Renames item_state to inhand_icon_state
Renames mob_overlay_icon to worn_icon
Renames mob_overlay_state to worn_icon_state
worn_icon_state/mob_overlay_state now never gets used for inhands.

* Fixes some comments

* Fixes map issue

* Restart lints

* Properly resolves conflicts
2020-05-25 06:47:19 +02:00
3803d6a817 Adds hardcore random mode: Earn your way onto a score-board with difficult random characters (#50606)
* start

* done

* done

* gold wheelchair

* mats

* icons

* Update code/datums/achievements/hardcore_random.dm

Co-Authored-By: ATH1909 <42606352+ATH1909@users.noreply.github.com>

* fixes

* Update code/controllers/subsystem/processing/quirks.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* proc

* Update code/__HELPERS/roundend.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update code/__HELPERS/roundend.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* playtime stuff

* Update code/__HELPERS/roundend.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/__HELPERS/roundend.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/__HELPERS/roundend.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/datums/traits/_quirk.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/datums/traits/negative.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/modules/client/preferences.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/modules/client/preferences.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/modules/client/preferences.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* fixes

* done

* fix

* removes u

* Update code/modules/client/preferences_savefile.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* overlay

* Update code/modules/mob/dead/new_player/preferences_setup.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/modules/mob/dead/new_player/preferences_setup.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* less braindead code

* woops

* Update code/__HELPERS/roundend.dm

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

* Update code/__HELPERS/roundend.dm

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

* Update code/controllers/subsystem/ticker.dm

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

* done

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
Co-authored-by: spookydonut <github@spooksoftware.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-05-10 12:16:01 -03:00
Arkatos1andGitHub c7c2e4b531 Mouse pointer icons cleanup (#50241)
About The Pull Request

This PR reorganizes all mouse pointers icons in the codebase into a single folder under /effects, and removes 4 unused mouse pointer icons, all of which are remnants of the Clockwork Cult.

Also removes one rogue white pixel in blind_target.dmi.
Why It's Good For The Game

Better organization and less space taken by unused icons.
Changelog

cl Arkatos
code: Mouse pointer icons were reorganized to be more easily used in the future.
/cl
2020-03-30 10:00:39 +13:00
spookydonutandGitHub 3c2e217ccc Secway and janicart key suicides (#49681)
* Update vehicle_key.dm

Adds a unique suicide to the secway key where the user spins, and gibs after a short delay.

* Improvements

Fixes a runtime, adds a little silliness.

* Adds shame result

Grammar changes and "rewards" anyone that successfully fails to commit suicide.

* Adds janicart key suicide

Adds a skillcheck to the suicide that will have varying effects based on the level the user has.

* Adds the return at the end of the file back

Whoops, didn't notice I deleted that I guess. Dunno if that matters, but I have no reason to remove it, so I'm putting it back.
2020-03-05 19:46:56 +08:00
JJRcopandAnturK a1392847bd Remove ismovableatom macro (#9) 2020-02-17 15:03:16 +01:00
Ryll RyllandGitHub fde42c3384 Adds the ol' banana in the tailpipe (#49200)
* you've been hanging out with him too much

* actually works now

* cleaner

* CLEANER
2020-02-13 10:02:50 +01:00
FikouandGitHub 8deeceefb6 [READY] Adds rideable Goliaths (#49003)
* adds rideable goliaths

* stamding on the emdge

* plems work

* this should be it

* FUCK YOU TRAVIS

* primal friendly

* ok athath buddy

* mmm grayons

* sprite gang

* placeholder sprite, works till someone makes a new one maybe haha

* lets do this

* An object tames a monstrous beast somehow. More news at 5.
2020-02-07 17:00:07 +01:00
spookydonutandoranges ac7f2b5166 Fix Crossed/Entered/Exited/Bump/ui_act parameter casting (#49016)
About The Pull Request

Detected as part of my work on SpaceManiac/SpacemanDMM#167
2020-01-28 10:51:15 +13:00
MrPersonandEmmett Gaines 26093e5ac2 Further update_icon splitup (#48784)
* Further update_icon splitup

After this there'll be just under 100 old update_icon() calls that need fixing.

* Thanks Travis
2020-01-22 10:18:05 -05:00
LemonInTheDarkandJordie f4f8a686df Makes grounding rods consistent, changes the supermatters bolts a great deal. (#48472)
* Goof I will find you and I will berate you

holy hell

Calm and peaceful ahhhhh

I swear goofs pc failing was the biggest tragedy in gaming

Fixes some flags

More touchups

Now to squash

Goofs PC failing was the biggest tragady in GAMING

* Fixing some misspellings before the bee gets me

* GOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF

* Full vehicle support

* Changes some flags around, "fixes" some bugs, makes being shocked less insane

* Makes spliting more reasonable, unfucks some shitty tesla code I copypasta'd into the sm, godspeed shitcode,
none noticed you.

* Removes my tesla_ignore_1 fix, another pr is up that should solve things, so we're just leaving it in for now,
gonna have to deal with merge conflicts when it gets merged, but that won't be too bad

* tfw

* Nothing to see here folks

* I'm a boomer
2020-01-10 23:25:11 +11:00
Emmett Gaines 119c4ebca3 Makes waddling an element 2019-12-31 12:55:53 -05:00
GuillaumePrataandTad Hardesty 575010b3bf You can now directly add trash inside a trashbag hooked on the pimpin ride (#47884)
You can directly add trash inside a trashbag hooked into a janicart but 
for the pimpin ride you had to remove the bag, put the trash inside the 
bag and hook it again, by copying the code from the janicart you can 
now do the same to the pimpin ride. Also added a extra line to 
prioritize placing the pimpin key on the ride instead of the trashbag.
2019-11-30 15:57:53 -08:00
Emmett GainesandRob Bailey 5481515dff Removes the non bitflag slot defines (#47742)
Removes the non bitflag slot defines
2019-11-17 17:52:11 -08:00
8a01398814 Adds achievement datums (#47058)
* First step

* achievements part 1

* epic

* done

* epic

* removes test datums

* adds minecraft achievement

* asss

* ass 2

* ass

* fix

* UPGRADE

* back-end partially

* back-end

* woops

* epic

* linted

* Achievements (#19)

* initialize SSachievements lists

* achievement ui actually tries to load

* witty commit description

* menu

* done

* done

* jesus christ

* ok linter

* Update code/datums/achievements/_achievement_data.dm

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

* Update _achievement_data.dm

* Update misc_achievements.dm

* Update achievements.dm

* Update

* And a space, goddamit!

* Rebuild tgui

* woops

* bruh moemnet

* ok conflicts

* finally
2019-10-26 05:57:42 -07:00
kingofkosmos 6d28a175d5 Fixes a few broken spans. 2019-10-13 21:51:07 +03:00
kingofkosmos dba1d2eb2d Fail-messages from notice-spans to warning-span. 2019-10-12 21:24:52 +03:00
kingofkosmos 280d416d4f Adds missing spans, missing periods and missing span endings. Also changes spans to suit the situation better. 2019-10-12 19:34:11 +03:00
QustinnusandEmmett Gaines a394ccdc2b Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)
removes materials list from items, uses custom_materials instead. This might introduce some bugs so we should testmerge this for a while (and Ill test stuff locally as much as I can)

this also adds material crafting to sheets. Test case being chairs. In the future we can add stuff like tables, walls, doors etc.

also applies materials to everything, with fixes, which can close #46299
2019-10-08 11:06:02 -04:00
nemvarandmoo a148cae769 Kills obj/item/projectile in favour of obj/projectile (#46692)
* Kills obj/item/projectile in favour of obj/projectile

* Resolves conflicts properly

* fixes that one map

* it lives
2019-10-06 13:37:24 -04:00
Dawson1917andmoo 400fd9c76e Secway is no longer FAST (#46615)
* sec away

* centrists

* Baul Plart
2019-10-04 18:31:57 -04:00
TheChosenEvilOneandRob Bailey 2d93a013d6 Motorized wheelchairs (#45737)
* Motorized wheelchairs

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* bruh

* woah

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Upped the power usage to 100.
With 15000 power cell you can move 600 turfs with tier 4.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Assign the variables directly instead of temp var.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Motorized throwing machine.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Motorized reviews.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-09-01 02:02:40 -07:00
Rob Baileyandoranges 2029163d33 playsound vary boolean define conversion (#46254)
About The Pull Request

Converts every single usage of playsound's vary parameter to use the boolean define instead of 1 or 0. I'm tired of people copypasting the incorrect usage.
Also changes a couple of places where a list was picked from instead of using get_sfx internal calls

This was done via regex:
(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\)) to match 1
(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\)) to match 0
full sed commands:
/(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\))/\1TRUE\2/ 1 to TRUE
/(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\))/\1FALSE\2/ 0 to FALSE

I'm not very good with regex and these could probably be optimized, but they worked.
Why It's Good For The Game

Code usability
2019-08-30 18:45:20 +12:00
MickyanandAnturK 93c2dc0c23 [READY]Skateboard overhaul (#45657)
* skeet skeet

* scoot

* removes debug message

* merge conflict

* oopsie

* polish, new board types

* begone

* actioninja review

* passtable trait

* fixes indent

* dwarfism check

* check for existing flag

* check existing trait

* screwdriver returns FALSE
2019-08-24 21:07:26 +02:00
MMMiraclesandRob Bailey 568ffcb053 im on a boat and im going fast and (#45822) 2019-08-11 02:25:59 -07:00
81Dentonandoranges 498a9a70fa Adds clown car logging (#45758)
This PR adds clown car logging when clowns enter it (multiple clowns can drive it), it succs people up, when it crashes into walls and when it fires people at things.
Why It's Good For The Game

Good for catching naughy clowns that drive into the arrivals shuttle
Changelog

cl Denton
admin: Added clown car logging to the attack log.
/cl
2019-08-09 11:31:09 +12:00
nemvarandRob Bailey e587b970da Adds parent calls to almost all tool_acts (#45582)
* Adds parent calls to almost all tool_acts

* actually compiles
2019-08-03 22:25:57 -07:00
nemvarandRob Bailey 55191413ba The clown car waddles (#45625)
* The clown car waddles

* movable atom instead of atom
2019-08-03 22:19:03 -07:00
Rob BaileyandGitHub ea6c11d1b9 Merge pull request #45537 from bgobandit/spellingiseasyidk
Various spelling, grammar, and text changes.
2019-07-31 02:40:02 -07:00
bgobandit 100542e09c makes requested tweaks 2019-07-30 18:58:00 -04:00
RandolfTheMehandRob Bailey 48fbc073e5 [TMC] Defib Rework, Organ Damage Effects (#45104)
* Brain damage works on organ damage procs, some defib reworks

* Heart and Lung damaging effects and failure, liver damage and failure moved to its organ again

* Cleans up reused global

* Organ damage procs on living and living/carbon

* Changes brain damage procs again

* SR heals all organs on revive, no decay for cybernetic implants, stomach damage and fail effects.

* Damage and failure effects for the appendix, ears, and some touchups on the stomach

* Committing changes so I don't lose them

* Organs now cease decaying in the proper containers

* Organ Fridges

* Reverts map changes

* Adds coronary bypass, lobectomy, trying to deal with organ_stat runtime

* Actually fixes merge conflict

* Smartfridge tweaks

* Think I figured out map merger

* Evidently not

* Still runtiming with glass shards even after I remove the map changes?

* Fixes runtime error with brain_item

* Runtime fix on living/carbon/life

* Cleaning up old PR code

* Brain damage fix, moves defines to actually be in _DEFINES, under DNA since that's where organ slots were

* Wrong math operation used

* Brains in MMIs no longer decay

* Removes redundant variable, and defibs no longer work on heart attacks caused by failing hearts

* Removes misleading comment

* init freezes organs in case organ crates are added, morgue corpses are frozen, removes adjustLiverLoss

* Removes random spaces, scanners check brain damage severity now

* Swaps numbers for defines, fixes brain surgery, rebalances coronary bypass bleed since that was insane last I tested it

* List change

* Runs off of an index instead of using cut

* Brains can be put into organ fridges

* Fixes minor type, hotfix for cloning problem

* Removes pointless check

* Demon hearts no longer decay

* Nightmare hearts no longer decay

* Removes istype() check on process, sets can_decompose instead

* Condenses organ damage report

* Removes organ failure messages

* Less organ damage spam, implements organ threshold messages instead

* Brain damage messages go to owner, not source

* Self-examine shows damaged organs

* Minor code cleanup, adds autodoc comments to the new procs

* Inverts standard organ vars to prevent random organs decaying, adds a few more autodoc comments.

* Merged the booleans into a set of flags

* Healthy living improves organ healing rates

* dunno why this didn't update

* my actions have consequences

* Sets ORGAN_SYNTHETIC for overlooked robotics organs

* Doubles heart decay time

* 3 minute heart decay

* Lobectomy/Coronary_Bypass heal more

* removes hivemind spells from the changes
2019-07-29 02:18:22 -07:00
TlaltecuhtliandRob Bailey 80f593dda6 puts message spam from not having keys on a vehicle on cooldown (#45507)
* Update maps.txt

* Update ridden.dm
2019-07-28 17:23:47 -07:00
bgobandit 09d38d3fad Various spelling, grammar, and text changes. 2019-07-27 21:09:53 -04:00
Emmett Gainesandoranges 328fc7b1f1 Adds elements: Lightweight shared components/Global components (#44817)
If you came here thinking this was some game feature then you are in the wrong place. Here is where I ramble about code.

This adds /datum/element as a sort of sibling to components. Only one of each type gets instanced and they do not get tied directly to any particular thing like a component does. Basically they're a very lightweight component for doing simple functionality that doesn't have much state.

Originally this concept came about as a kind of component that could be shared between many parents to reduce some resource costs. Doing this would allow us to componentize more behaviors that are a part of too many things to be viable to have a whole component for every single one. For example a component on every space turf would be entirely unviable. With elements it's much more reasonable.

This implements a prety bare framework and a couple components are migrated to it. It's ready to be used but I fully expect I'm going to need to refine how it works for all the usecases we'll want it for.

Also: this fixes the qdeleted signal. This signal isn't even possible because after qdel is done there's nothing to receive a signal anyway. I've changed it to a qdeling signal instead. I need it to work for some elements to know when to clean themselves up.
2019-07-09 11:26:51 +12:00
orangesandGitHub 64460ae3ca Merge pull request #44825 from AutomaticFrenzy/patch/lints
In advance of eventually adding SpacemanDMM's linter to Travis, fix everything it can currently detect.

Some lists, including global lists, are given types so that L[i].foo expressions can be checked.

Some procs are given a new form of return type annotation so that DuplicateObject(O).forceMove()-type invocations can be checked.

Open to syntax suggestions on the return type annotations, and on whether the preprocessor strategy makes sense.

Return type syntax is currently roughly:

    <typepath> | <paramname>([_])*(.type)?
2019-07-03 19:31:11 +12:00
Tad Hardesty 0f0604575f Add return type annotations to some procs 2019-06-25 23:03:38 -07:00
kingofkosmos ebf787a97a * "You should..." and "You must..." 2019-06-26 06:13:32 +03:00
vuonojenmustaturskaandAnturK 8ddc9677c7 examine-code refactor (#44636)
* 1/4 done? maybe?

* more

* stuff

* incremental stuff

* stuff

* stuff & things

* mostly done but not yet

* stuffing

* stuffing 2: electric boogaloo

* Git Commit and the Kingdom of the Crystal Skull

* make it actually compile

* found more stuff

* fixes

* fix AI laws appearing out of order

* fix windows

* should be the remaining stuff

* this time for real

* i guess it should compile too

* fix sechuds
2019-06-19 22:07:57 +02:00
893b020228 Some spelling and text changes. (#44426)
* fixes some spelling

* Spelling changes, immersion changes, text changes in general

* Update code/datums/mutations/body.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2019-06-11 14:36:56 +02:00
vuonojenmustaturskaandoranges 6a106bc877 Remove reagent ids and use typepaths where applicable (#44166)
cl Naksu
code: reagent IDs have been removed in favor using reagent typepaths where applicable
fix: mechas, borg hyposprays etc no longer display internal reagent ids to the player
/cl
2019-05-31 21:57:26 +12:00
Tlaltecuhtliandoranges 1625ecdef4 fixes message spam from ridden vehicles (#44116)
* fixes message spam from ridden vehicles

* e
2019-05-27 22:53:11 +12:00
YPOQandmoo bf9d249a42 Fixes borg wheelchairs going super fast (#43761) 2019-05-01 08:54:37 -04:00
Tlaltecuhtliandmoo 5cfd1c851c [ready]secway + atv nerfs (#43396)
* 1

* dont commit this

* commit this

* commit erefasdagsdbsvrsccsdsdfsdfs

* changes

* fdf

* fixes bullet_act

* obj_break

* (____Y____)
2019-04-13 16:11:24 -04:00
ShizCalevandmoo d128a12773 paraplegic vehicle fixes (#43399)
* paraplegic vehicle fixes

* im on a boat
2019-04-03 11:10:57 -04:00
ShizCalevandTad Hardesty 896236f5bf Clowncar exploit fix (#43237)
Fixed an exploit allowing you to grab people from anywhere with a clowncar.
2019-03-21 20:57:09 -07:00
ShizCalevandTad Hardesty 362988c1ed Simple animals can only damage clowncars from the inside if they can smash walls (#43238) 2019-03-21 20:38:16 -07:00
ShizCalev 87f14a9885 Beartrap fixes 2019-02-24 14:54:15 -05:00
tralezabandJordan Brown c967f674ad fixes borg wheelchair sanic speed (plus the whip) (#42602)
* SKRRRRRRRRRRRRRRRRRRRRRRRRRT

* VRRRRRRRRRRRRRRRRROOOOOOOOOOOOO

* rrrrrrrrrrrrrrrrrrrrrrrrrrrrr    RRRRRRRRRRRRRRRRR (checks on whip removed)

* Apply suggestions from code review

elegant changes

Co-Authored-By: tralezab <40974010+tralezab@users.noreply.github.com>

* thbahtegegarf

* whoops

* ebhfbfaaetbfheabhehaetjyr
2019-01-31 16:56:05 -05:00