Commit Graph

54 Commits

Author SHA1 Message Date
Qustinnus b33d1c49a3 [READY] Floydmats (Datum materials) & custom toolboxes (#45118)
* Initial work

* more

* ass

* wsedfwedff

* asss

* test

* stuff

* fuck

* sss

a

* kms

* asdadwedwdfwefwef

* start

* test

* dwwdew

* ewefwfef

* Redemption machine (#8)

* Redemption machine

* Removes debug messages

* changes

* fuckmyshitup

* coin mint works with new material shenanigans (#10)

* Auto stash before merge of "materials" and "origin/materials"

* woops

* furnace (#11)

* autolathe manufacturing of toolboxes

* eggs in a basket

* some small changes

* matcolors

* documentation

* more documentation and effects

* done

* Color man bad (#12)

* fixes designs

* ass

* more fixes

* fuck me

* firestacks adder

* epic fixes

* fixes designs

* DONE DIDDILY DOO

* removes category macro

* ch-ch-ch-changes

* fixes some stuff

* Fixes display of ore values (#9)

* Redemption machine

* Removes debug messages

* Re-adds value display

* Replaces the fire stacking component with an element instead (#13)

* fixes examine

* fixes ligma bugs

* double ligma boofus

* fix

* misses some defines

* fixes ORM

* Update code/datums/components/material_container.dm

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

* fixes

* Makes glass objects weaker (#14)

* Makes glass objects weaker

* uses correct proc

* fixes shit

* honk honk

* better

* oh shit oh fuck

* fixes

* fuck ORMs

* fixes the biogen

* documentation

* ass (#15)

* component

* changes

* ass

* ass

* doc

* Auto stash before merge of "materials-plasmacomponent" and "origin/materials-plasmacomponent"

* fixes rounding

* fixed
2019-07-24 11:27:01 -04:00
vuonojenmustaturska 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
nemvar 137e2af8e2 Turns art into a component (#44525)
* welp

* h

* artcomponent

* I forgot something

* handsome squidward

* handsome squid

* n

* Ghosts should have fun too, I guess.
2019-06-18 14:23:42 +02:00
py01 ace1a0b390 Hivemind ability changes (#44436)
* fixes reclaim on dead hiveminds

* adds exnendo hand min range var

* replaces hive warp with telekinetic hands, no inhand sprites added yet

* changes hive_shock to sensory effects, no sleep

* syntax fix

* adds new curse variant

* sensory overload power modifier, heart attack replaced with necropolis curse variant

* hivedrain removes stam dmg

* does curse subtype in more sane way

* changes circadian sleep to knockdown

* spell path and icon path changes

* shock channel, pin weaker on hives, cooldown changes

* telekinetic hand inhand sprites

* adds message to teople surrounding mind contol victim on cancel

* hivemind icon changes

* nightmare changes

* removes stun on mc end

* hivemind forcewall lasts longer

* prevents negative power values on shock

* chages nightmare duration and effect

* hive shock changes

* userdanger message on mind control end so people see it

* fixes merge

* removes control change

* removes unneeded var

* typo

* fixes me commiting the wrong shit

* syntax fix
2019-06-18 08:56:01 +02:00
bgobandit f9330d2fd1 Art produces moodlets, good or bad depending on quality. THE REMAKE (#44174)
* Art produces moodlets, good or bad depending on quality.

* makes more requested changes

* makes requested changes/placates oranges

* fuck this shit

* this is my last will and testament, when I am dead and gone I request that my relatives make the changes that I will probably still be requested to make at that point
2019-06-08 21:58:13 +02:00
wesoda25 b81a18c29b [READY] Adds Purified Soulstones and Constructs (#44036)
About The Pull Request

Purification of a soulstone (hitting it with a bible as noncult) no longer destroys the stone, and releases a spirit. Instead, it purifies the stone, which is crew friendly and has a new sprite. Said stones can be placed into construct shells to create purified angelic constructs, which are easily distinguishable from cult/wizard constructs.
Why It's Good For The Game

Crew finding and using construct shells to create stealthy anti-cult constructs sucks. This PR would get rid of this shitty gameplay, and adds some new flavor to the whole cult/anti-cult dynamic.
Changelog

cl weeeeesoda
add: You can now purify soulstones! This can be done by any crew member using a bible on one.
add: Purified constructs can be created by using a purifed soulstone on a construct shell. Amongst their normal abilities, purified constructs can dispel cult runes by clicking on them.
del: Ability to place chaplains soulstone or mining soulstones in construct shells
imageadd: angelplasm, angelic sprites, purifed sprites
/cl
2019-06-01 08:41:37 +12:00
vuonojenmustaturska fb45b7a017 Turns trait accessors into defines, fixes some bugs (#43820)
It's free performance.
2019-05-06 19:44:05 -04:00
coiax 881e8c1ab9 Refactors NODROP flag into TRAIT_NODROP (#42109)
* Refactors NODROP flag into TRAIT_NODROP

🆑 coiax
fix: Anti-drop implants can no longer be used to drop objects that they
were not responsible for sticking to a person's hand.
fix: Backfiring with a Barnyard spellbook will now play a spooky horse sound.
refactor: Refactors the way that "NODROP" items work to a new system,
there should be no change in functionality.
/🆑

Various items in the codebase were doing weird hoop jumps in order to
preserve the nodrop flag's state when it also wanted to change it, so I
moved it to a trait system.

I may have gone overboard with the type of unique trait sources, but
those can be changed later. My long term plan is make a general "CURSED"
nodrop origin, which means you can unlock cursed items by being hit with
a bolt of door opening or something. But that's for another PR, this has
no functionality changes, apart from some slightly modified descriptions
on cursed masks.

- Removed a bunch of redundant voice changing code for all the voice
changing animal masks, used two new clothing flags for this purpose.
- Also refactored a bit the animal masks, making new cursed subtypes that play
the sound when created.

* Drop location
2019-01-17 15:24:30 -05:00
Denton a8e55f5ce4 Restricts magspear throw_range 2019-01-08 17:42:16 +01:00
Militaires 37f6d2fa1d corrects Hippocrates bust description (#42244)
* corrects Hippocrates bust description

* cited >> referred to
2019-01-07 19:26:56 +13:00
81Denton cd3d97c1a6 Reworks spearguns, adds Syndicate bundle, carp clothing adds carp faction (#42102)
* Reworks magspears, adds Syndicate bundle, carp clothing adds carp faction

* 20 magspears

* Replaces bandolier with quiver

* Slightly increases throwforce to OHKO space carps
2019-01-07 19:19:45 +13:00
anconfuzedrock 423982ed7b makes slapping easier (#41914)
cl
tweak: slapping now doesn't require a specific intent or limb to be targetted.
/cl

Slapping was originally designed to function as a thing that happened if you aimed for the mouth and disarmed. since a slapper is its own emote, all the extra conditions do nothing but make slapping sometimes sound better than others. All this will do is make all slaps make the slap noise and not show the hand, as god intended.

* makes slapping easier

* fixes not being able to slap nonhumans
2018-12-16 13:05:28 +13:00
MMMiracles a5f5aee5a2 [READY]New Map: Donutstation V.5 (GOLD) (Platinum Hits) (#41099)
cl MMMiracles
add: A new(old?) map, Donutstation, is now in rotation.
/cl

Map Image
Comparison Image of Original

Progress

Departmental Layout
Atmos
Wiring
Detailing/fluff

    Floor tiling

A faithful recreation of Donutstation, keeping some landmarks of the old map similar while bringing in all the new content and departments that come with it.
2018-12-16 12:47:27 +13:00
XDTM b7c7593191 [Ready]Moves traits to datums (#38505)
I've been in a few situations where traits would be handy to track certain object or datum flags, and there's no particular reason that ties them to living mobs aside from being initially a disability rework.
2018-09-22 21:50:03 +12:00
vuonojenmustaturska de357a79d8 Adds plasmaglass shards, they can be made into spears (#40327)
* stuff and things

* adds back missing gonbola

* remove useless var

* slapcrafting fix

* transfer memes
2018-09-19 23:05:43 +02:00
ShizCalev 98a6b39cca Clean up mixed space & tab usage (#40121) 2018-09-05 22:51:20 -07:00
Mickyan 43700c3273 Skateboards have adjustable speed, can fit in backpacks (#39496)
Skateboards are fun but without even considering the bumping hazards they're almost impossible to use on station just because of how unreasonably fast they are.
They're so fast, they couldn't be any faster. Literally! They have no move delay, making them as fast as a vehicle can possibly be.
But if you think you can handle it, you can simply adjust it back to sanic speed. Crashing penalties are unaffected.

I see no reason why they shouldn't fit in backpacks, maybe they used to be strong weapons a while ago but nowadays you can find stronger stuff just laying around that fit in backpacks just fine.
Plenty of items bigger than a skateboard that already fit in backpacks, too. (i.e. instruments)
2018-08-30 19:59:39 +12:00
kevinz000 48ece11504 Felinid/catpeople are now their own human subspecies (#39513)
* Catpeople are nyow a species

* Fixes a runtime

* Fixes the issues with being forced ears when you chose none

* Neko --> Felinid

* P2

* Update

* Working this time I promise
2018-08-08 20:56:46 +03:00
Qustinnus 284f90a3ab Makes some requested changes to mood (#38851)
cl Floyd
del: removed beauty / dirtyness
balance: Mood no longer gives you hallucinations, instead makes you go into crit sooner
/cl

oranges requested these changes, i havn't coded in DM for a while so I might have made some mistakes
2018-07-08 13:50:54 +12:00
Trevor Serpas bee0b5b2c3 Afterattack() Signal (#38606)
* adds signal and modifies each call of afterattack to call it's inherited proc

* uses new macro for sendsignal()

* map fuck

* skip precommithooks

* combine and negate 2 ifs
2018-07-07 02:00:25 -04:00
vuonojenmustaturska c65a99f130 Move NODROP_1, DROPDEL_1, ABSTRACT_1 and NOBLUDGEON_1 to item_flags where they belong (#38171)
* (mostly) nodrop

* (mostly) dropdel

* (mostly) abstract

* nobludgeon

* things i missed

* forgot one

* unintended changes

* energy handcuffs
2018-06-01 11:36:31 +02:00
MrDoomBringer 2741541774 fixes people trying to fix the bangammer's grammar (#38129)
* that means you, Michael-Ashfield

* fixes grammer

* blockquotes
2018-05-29 15:13:13 -07:00
vuonojenmustaturska 4f0b0b7ec1 Replaces /atom.initialized and .admin_spawned with flags (#37981)
kill .initialized and .admin_spawned from /atom
2018-05-24 02:20:50 -07:00
ShizCalev 8f64b6cb22 Changes cockroach guts to insect guts 2018-05-02 06:44:35 -04:00
Jordan Brown e402a6c9ac Merge pull request #37501 from ShizCalev/icon-fixes
Fixes missing icons
2018-04-28 15:55:56 -04:00
ShizCalev cda6c6662c Fixes a number of missing icons 2018-04-27 15:36:42 -04:00
AnturK 4c5a43eeb8 Prefix for item flag slot defines. 2018-04-27 10:30:48 +02:00
Fox McCloud 057aa31cda Kills off /obj/item/device (#37297)
* Kills off /obj/item/device

* whoops

* whoops

* Fix
2018-04-23 15:00:23 +02:00
Ian Turk fbe5f4a062 Replaced body zone magic strings with defines 2018-03-19 15:44:51 -05:00
Qustinnus 4911991f70 [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#36344)
cl Floyd / Qustinnus
del: Removes short-term effects of mood
add; Adds long-term effects of mood by implementing sanity which goes up with good mood, down with bad mood, but takes time to change. Your sanity can be seen as your average mood in the recent past. All effects of moods are now covered by this system
add: Beauty component, currently only attached to cleanables, but you could attach it to any atom/movable and make them pretty/ugly, affecting mood of anyone in the room.
refactor: Removes the original way of adding mood events, uses signals properly instead.
fix: Cleanables "giving" area's free beauty during initialization
fix: Fixes some events not clearing properly
/cl

Fixes #36444

From now on mood no longer affects you directly, instead it decides whether your sanity goes up or down, when your sanity gets too low you will get the effects of what mood did before.

This means getting hit with bad moods due to being attacked while not mean you are doomed anymore, and you get a large timeframe to get away and just fix your mood later.

I also added the beauty component, you could add this to any object and it would either make a room prettier or uglier, comparable to DF or Rimworld. You could add traits to make certain people ugly, for example.
2018-03-18 19:48:50 +13:00
Ashe Higgs 7c38e7eac3 Refactors butchering to a component - item-based butchering effectiveness, speed, and chances (#35744)
* Butchering component

* auto-butchering based on toolspeed

* Gives drills their butchering back

* redoes toggles
2018-02-26 09:50:16 +13:00
Jordan Brown d282c60c7d Quote the armor lists (#35668) 2018-02-16 01:25:42 -05:00
AnturK c3c9f4c668 Highlander antag datum (#35519)
* Highlander antag datum

* Forgot debug line

* Also this
2018-02-11 16:32:06 -05:00
PKPenguin321 fa08aaf7fe adds extendohands (#34599)
* adds extendohands

* adds to arcade prizes, crafting menu
also adds an alternate named/desc'd version for arcade prizes

* removes the else

* actual conflict fix instead of accidental revert

* ACME -> acme
2018-01-29 18:36:35 +02:00
vuonojenmustaturska 2871b70733 /obj/item var cleanup (#34909)
* draft 1

* Update energy.dm

* Update twohanded.dm

* Update weaponry.dm

* Update ninja_stars.dm

* Update cult_items.dm
2018-01-25 22:44:32 -05:00
XDTM 5a08a3aad0 Extends the disability refactor to include more traits, removing some snowflake code (#34664)
This way you can add/remove traits without fear of other sources overriding them. Now you can add TRAIT_STUNIMMUNE to somebody without what if hulk

Notable changes:

    Fakedeath now updates instantly, instead of waiting for the next life tick.
    Fakedeath now sets time of death when acquired.
    Removed extremely snowflake code in reagents that checked if you had morphine to remove slow immunity and so on.
    Hulk no longer overrides status_flag changes, in case there are any.
2018-01-25 09:12:44 +13:00
Jordan Brown dff4c8a862 Merge pull request #33241 from swindly/suicide
Adds some suicide acts
2017-12-09 16:22:00 -05:00
kevinz000 5182128d2a refactors riding datums to a component, vehicle refactor staging for mech overhaul (#32249) 2017-12-04 10:33:01 +13:00
kevinz000 caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
swindly b8dae82098 adds suicide_act()s 2017-11-10 18:23:01 -05:00
MoreRobustThanYou 0f005901c6 You can now use banhammers as a weapon (#32270)
* You can now use banhammers as a weapon

* Update weaponry.dm
2017-11-02 03:25:40 -06:00
Jordan Brown 8281df511a Removes force from slappers 2017-10-27 10:22:08 -04:00
Jordan Brown c54864d2ad --no-edit 2017-10-25 23:38:00 -05:00
Firecage afd8bb7be5 Code Consistency: luminosity --> light_range (#31355)
* Code Consistency: luminosity --> light_range

* Finally-remembers-to-update-PR is best lizard.

* Update singularity.dm
2017-10-22 01:06:07 -04:00
ShizCalev 362d304714 Fixes slapper inhand (#31793) 2017-10-17 12:35:00 -06:00
oranges cf3f3dc4ff Merge pull request #31699 from jughu/Misc
Increasew the size of the katana from normal to huge
2017-10-17 21:49:09 +13:00
jughu bac0576345 Update weaponry.dm 2017-10-14 11:34:32 +02:00
deathride58 33d59567a6 Adds Slappers (#31406)
* ADDS SLAPPERS

* fixes everything, just need sprites

* nerfs criticism
2017-10-10 20:53:32 -04:00
Tad Hardesty 5a0bb2f599 Grammar fixes to atom descriptions (#31293)
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
Armhulen bcbc16691b chainsaws rebalance, but working this time :) (#30399)
* buff chainsaws 2: electric boogaloo

sned help

* Revert "helps chainsaws out"

This reverts commit 2954df89e9393bb29894a29af83abe3d69f27c78.

* helps chainsaws out

i'm sorry we hurt you chainsaws

* i'm not stupid i'm misguided!

but i actually totally agree with this so !go kor!

* AH, BINGO.
2017-09-09 01:00:34 +10:00