Commit Graph

12094 Commits

Author SHA1 Message Date
Rob Bailey
65e9888fa6 [READY] Smart Cables (#44265)
Cables now autoconnect on cardinal directions. All cable placement has been completely stripped out and replaced with simple single cable per tile logic.
Low effort demo: https://www.youtube.com/watch?v=fXp8s6ORWbA
Yes I am aware that cutting it is not dropping wire, that version was bugged.
Cables no longer need a knot specifically placed to link to power objects. The sprite is automatically changed to represent this.
The only exception to this logic is that on smes units, due to the terminal being next to the output, they will not link there.
On a technical powernet side, this is the same as old cables once actually placed. They still use the existing powernet system, just the placement and connection works differently.

Old cables have been turned into "pipe cleaners" for wire art purposes. they work just like the old ones, just missing all the powernet functionality, and also you can put them on top of the floor.
Why It's Good For The Game

How obnoxious cables were to both map and work with in game has been something that has annoyed me for a really long time now.
This is both easier for new players to learn, and easier for experienced players to work with.
Along with making in game much more intuitive and easier, it makes mapping much easier as well. Mad lad wjohn was able to rip out all the mapping conversion in one day because of how much faster it is to work with.

cl actioninja and wjohn
add: Cables have been completely reworked. Simple per tile connection logic, automatically connects to things above it. Think minecraft redstone.
add: Old cables have been kept as pipe cleaner. They are non-functional in terms of power, but otherwise have the same connection logic. Also can go on top of tiles.
remove: mech cable layer has been removed because it was terrible shitcode nobody used
tweak: (sort of balance) cable stack sized has been reduced to 15.
/cl
2019-06-22 10:24:37 +12:00
Tlaltecuhtli
b642ed67a7 the stinger (#44515)
buzzes profusely at the really bad commit names
2019-06-20 20:58:13 -04:00
Shaps
8954265573 Agender fixes (#44597)
Credits to Europaisch for help finding all the records stuff

Fixes a few issues I was not aware of with my initial PR

* Being agender is now a distinct DNA value (fixes agender spessmen
  turning female when having their DNA referenced, like during cloning
  and some rudimentary transformations)
* Neatens up preference code, more in line with previous code, fixes
  an issue with male underwear not surviving preference loading and
  defaulting to female underwear
* Allows agender spessmen to change their facial hair with mirrors
* Change medical, personnel, and security records from sex to gender
  and add "Other" option (they currently display "plural" even for
  agendered species like ethereals)
* The -san honorific now applies to plural gender instead of just
  neuter with the Chinese Cartoons admin secret (highly important)

I have never really played genetics and only tested the DNA code with
cloning and rudimentary transformations while still in a body (which
causes it to reference the old body's DNA, like with cloning). Please
let me know if there's a better way to do this and/or if this is apt
to create issues.
2019-06-19 13:59:39 -07: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
oranges
dbf8658540 Merge pull request #44629 from vuonojenmustaturska/defines
Resolve overlapping defines by adding more specificity
2019-06-19 22:56:05 +12:00
nemvar
6eaf40adb1 Makes the hermit more based. (#44564)
* welp

* h

* Let's hope I didn't mess map diff up.

* prisoner unbased
2019-06-18 23:24:09 -04:00
wesoda25
67c2434a21 Adds lots of New Items to Syndicate Kits (#44509)
* Update uplink_kits.dm

* fucking stupid man

* Update energy.dm

* Update uplink_kits.dm

* Update special.dm

* Update special.dm

* Update misc.dm

* Update special.dm

* Update misc.dm

* makes hacker better
2019-06-18 23:22:57 -04:00
FrankFo
645156ff60 De-linkifies names in deadchat_broadcast(), makes deadsay css class default (#44600)
* De-linkifies names in deadchat_broadcast(), makes deadsay css class default too

* Makes the source argument come after message, since it is optional

* Removes excess </span>
2019-06-18 22:49:02 +02:00
vuonojenmustaturska
ef414ee4d7 [READY] Replaces mining points with money, adjusts gulag payout (#44507)
* woop

* adjust miner regular payout

* golem, orm upgrade changes

* liberator

* tgui.js
2019-06-18 10:17:34 -04:00
vuonojenmustaturska
58935e41c9 Fixes and speedups to spraycans/crayons (#44561)
* spraycan stuff

* tgui.js again

* Update text.dm
2019-06-18 15:25:49 +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
Naksu
28b1e366d8 Resolve some duplicate defines 2019-06-18 13:08:53 +03: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
oranges
0cb0f115cd Merge pull request #44569 from AnturK/pickupsanity
Fixes item pickup sanity.
2019-06-18 11:54:38 +12:00
Akrilla
041680be63 [READY] Syndicate Contracts (#44420)
* Emag bounty computer to show contract connection

* Corrupted text helper

* WIP on corrupted text

* Randomly corrupt text when looking at connect screen

* Barebones accessible Syndicate bounties screen

* Contract barebones and Synd UI work

* Further text changes, antag checks

* Further UI changes, full contract generation with areas/target

* dropoff point checks, and move to uplink item for requesting bounties

* WIP contract uplink item

* Contract uplink and continued contract improvements

* Completed contract uplink, and continued contract work

* Droppod WIP

* Further droppod work

* Mob WIP

* Further mob WIP

* No mob

* Callback for putting in mob

* Further WIP with pod checks

* Better location picking and signal fix

* Further pod changes, WIP of payouts

* Overall finished payment/contract system

* Code cleanup


Revert changes to bounty console


Remove debug messages

* Small refactor

* Add kit with set and randomised items.

* Fix box

* Very minor flavor text for inserting into pod, plus roundend text

* Pod return sound

* Contract uplink slight styling changes

* We don't keep giving telecrystals until they literally can't hold anymore

* Ship them off to ninja base instead

* Nerf bring them dead, but give a nice boost for bring them alive

Overall this is a nerf, so we also throw in an agent card to the bundle

* Ship them back

* Minor text changes and slight TC change

* Always give the black and red variant space suit

* Error sounds

* Dropoff area locator

There's sometimes duplicates, i.e. security office - but only one of them will work. This shows you where to go.

* Small fixes

* Bugfix, further changing of TC

* Ransom wip

* Ransom system

* Few changes

* Properly pay for ransoms and appropriate logic for dropoffs

* Terminal sounds

* Talk on command channel when ransom is given, or if they were too late

* Change to announce system

* Announcements/auto pay ransom

* Proper wait

* Name pods properly

* Don't send blacklisted items

* fix

* Improvements

* Announcements are less huge...

* Not a file...

* Improvement

* Drop them not in a wall

* Halves eye blur and styles payment vend

* No memes allowed
2019-06-17 20:32:46 +02:00
nemvar
d9761d448d Adds primal farming implements. (#44388)
About The Pull Request

Adds a rake (reskinned cultivator) and a wooden hatchet to the ashwalker base. Replaces their bucket with a wooden bucket.

Added crafting recipes for the rake and wooden bucket.
Why It's Good For The Game

It looks more flavourful (inb4 where did they get the wood from) and adds a bit of functionality to unused content (i.e. ashwalker farming).
Changelog

cl
add: Added wooden farming implements to the ashwalker base.
add: Makes rakes and wooden buckets craftable.
/cl
2019-06-17 13:34:15 +12:00
vuonojenmustaturska
b076b6c6d5 Fix another source of /datum/reagent/vanilla ice cream (#44543) 2019-06-16 11:43:29 -07:00
AnturK
50006cd0dc Fixes item pickup sanity. 2019-06-16 20:24:18 +02:00
oranges
2d30317a49 Merge pull request #44510 from ninjanomnom/revert-datum-output
Reverts datum outputs
2019-06-16 08:31:38 +12:00
Tlaltecuhtli
b8aa07a51e grenades quickfixs (#44485)
* fbghgfsd

* sdasd
2019-06-14 13:57:56 -04:00
nemvar
74c8498c08 [Ready]Gives ashwalkers an antag datum (#44396)
* welp

* Savages, savages, barely even human.

* Savages, savages, barely even human

* You didn't see this

* h

* bee gone

* FFS, I mixed up my... ugh

* savage

* removed test line

* Turns ashwalkers into antags

* fuck

* hjjg

* fixes stupid

* g

* h2

* Damn...

* There we go?

* If it compiles, we can ship it

* Forgot the actually remove the thingy
2019-06-14 19:48:12 +02:00
AnturK
c36f52e16d Makes emag logging more transparent. (#44464) 2019-06-14 09:43:13 -04:00
nemvar
9a69d66feb Fix the open closet verb (#44480)
Fixes a bug and actually makes it do what it's supposed to do instead
of a hand attack.
2019-06-13 19:24:49 -07:00
ninjanomnom
56196df9c6 Reverts datum outputs
reverts #43038
reverts #41535
2019-06-13 20:09:10 -04:00
nemvar
947b69770a Refactors medical stacks. (#44415)
* welp

* Revert "welp"

This reverts commit b2f9143468.

* Improves medical stacks.

* visible

* fix
2019-06-11 15:09:56 -04:00
Tlaltecuhtli
4a247210fd changes how grenades with custom primer are made (#44258)
* assemblies are shit fuck em

* maybe press commit before making a pr

* proxy stuff

* morestuff

* qol stuff

* only 1 wire

* revert that garbage that made me conflict

* changes

* wires
2019-06-11 12:28:35 -04:00
Emmett Gaines
6e1a049052 Removes an infective GetComponent (#44422)
* Removes an infective GetComponent

* Adds a meme underscore

* Restructures signal registration
2019-06-11 13:59:08 +02:00
nemvar
9403c15b28 Turns the parasite egg organ slot into a define. (#44404)
* welp

* Revert "welp"

This reverts commit b2f9143468.

* Breaking some eggs
2019-06-11 13:52:16 +02:00
nemvar
08cc067835 Turns sinew cuffs into a cable cuffs subtype (#44354)
* Makes ashwalkers more based.

* grammar
2019-06-10 00:32:34 +02:00
AnturK
e0824114db Adds hourglass (#44384)
* Adds hourglass

* Proper icon and animation.

* Makes throwing not break animate.

* Adds hourglass to library game vendor.
2019-06-10 10:31:24 +12:00
Arkatos1
e82707a8cc Examine tooltips now work on items put into storage (#44311)
* Examine tooltips now work in items put into storage

* IN_STORAGE define

* IN_STORAGE bitfield and proper parenthesis
2019-06-09 18:15:12 -04:00
nemvar
00e7152e77 Carpburster (#44273)
* Carpburster

* Update dehy_carp.dm

* Update code/game/objects/items/dehy_carp.dm

Why not. Doesn't make a difference.

Co-Authored-By: MrDoomBringer <emmanuelssr@gmail.com>

* Update dehy_carp.dm
2019-06-09 17:48:30 -04:00
nemvar
ce2be42f45 Chuncky jackhammer and shovel webbing (#44243)
* Update mining_tools.dm

* Update belt.dm
2019-06-09 17:34:11 -04:00
Emmett Gaines
45ec62931d Finally removes the signal redirect component (#44251) 2019-06-09 17:25:50 -04:00
Rob Bailey
5743c9a748 Dragging prone mobs slows you down, fireman carrying (#44155)
About The Pull Request

Dragging prone mobs (resting, knocked down, stunned, dead, in crit, etc) that aren't buckled to anything slows you down.

You can fireman carry by aggressive grabbing then click dragging onto yourself. This causes a slight speed penalty that is lower than dragging.
Why It's Good For The Game

Prevents the classic "stun and beat the shit out of while zipping off" which is obnoxious and I don't think anybody likes besides the people who do it.
Makes it so if you feel like being a cunt you can rest while being arrested to make you a pain to take back.
Makes it harder to steal bodies and move away before anybody can properly react, but makes dragging bodies riskier at the same time
Fireman carrying adds an element of risk reward, it takes a little while of standing still to pick them up and also slows you down slightly. More useful to move someone a long distance out of a relatively safe area than a quick pull away.
Changelog

cl
add: fireman carrying. Aggressive grab then click drag onto yourself.
tweak: pulling prone mobs slows you down.
tweak: carrying another human slows you down.
tweak: pacifists can aggressive grab.
/cl
2019-06-09 23:54:02 +12:00
nemvar
94d25d1024 Adds craftable firebrands. (#44376)
* Prometheus

* /aaa
2019-06-08 20:19:42 -04: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
py01
a0ae838acd Radio jammers jam the radio more (#44313)
* replaces radio jammer text replacement function

* radio jammers stop all radios now

* documentation, fixes range check on radio jammer
2019-06-08 13:31:07 +02:00
nemvar
c44120b5d1 Adds bee plushies (#44342)
* Adds beeplushies

* makes the behind less pure black

* Newline
2019-06-07 13:55:02 -04:00
oranges
405205843f Merge pull request #44279 from ExcessiveUseOfCobblestone/breathe-into-me
Turns Perf into The Standard Oxychem, Heavily Tweaks Perf To Fit My Freshly Repackaged Fantasy
2019-06-06 22:15:54 +12:00
oranges
46ab6ed44f Merge pull request #44227 from Qustinnus/crab
Slightly raises the Crab-17 machine's drain rate and health
2019-06-06 22:09:13 +12:00
Tlaltecuhtli
dab6944369 adds bamboo and fixes sugarcane (#44192)
* 1

* 2

* oh fuck

* kjhgfdfghj
2019-06-06 22:06:47 +12:00
vuonojenmustaturska
2d74a86353 [READY] Cleans up saycode by removing random hook stubs and using a signal where relevant (#44320)
About The Pull Request

This PR removes speech message and span hooks from dna, mutations, pierrot throat disease, species, tongues, masks, hats, held items, brain traumas and a carbon proc overload handling tonguelessness.

Tonguelessness is now handled by tongue removal registering for the speech signal and the hook being deregistered by having a tongue put in.

Also cleans up some /atom/movable/proc/get_spans() overloads that called the empty parent or overloaded the parent to do the exact same thing as the parent proc did.

Also cleans up calls to radio.talk_into() where the caller would often, as a result of copypasta, provide the proc with fresh copies of the proc's default values for proc args, and makes say_quote() better by giving it a default spans value so that none of the callers have to provide the same default one.
Why It's Good For The Game
Changelog

cl Naksu
code: Cleaned up saycode
/cl

* start with this

* oh man this looks so good

* hats are dead

* /obj/item/proc/speechModification is dead

* brain traumas and get_held_item_speechspans() are dead

* these should be static

* unfortunately we still need this

* /mob/living/carbon/treat_message(message) is kill

* clean up get_spans()

* dunk get_spans, modifies_speech for brain traumas, some superfluous static stuff

* move stuff around

* return values
2019-06-06 18:35:06 +12:00
nemvar
761a3511c5 Update backpack.dm (#44291) 2019-06-05 02:38:23 -04:00
Nalzul
47700b8679 Allows you to wear the caution sign + new sprite for the caution sign (#44289)
* +Sprite +Repath

* Adds 5 brute armor
2019-06-04 11:48:47 -04:00
Emmett Gaines
c3f95024b2 Gets rid of the GetComponent macros (#44220)
* Removes the GetComponent macros

* Regex replacement for GET_COMPONENT

Search: `GET_COMPONENT\( *(.+?) *, *(.+?) *\)`
Replace: `var$2/$1 = GetComponent($2)`

* Regex replacement for GET_COMPONENT_FROM

Search: `GET_COMPONENT_FROM\( *(.+?) *, *(.+?) *, *(.+?) *\)`
Replace: `var$2/$1 = $3.GetComponent($2)`
2019-06-04 17:39:58 +02:00
ShizCalev
30fd6ddeac Merge pull request #44280 from kingofkosmos/spanendingfixes
Adds missing </span>'s.
2019-06-04 05:50:50 -04:00
spessbro
19dcc8346a New book option for the chaplain (#44195)
About The Pull Request

Adds book of Insulationism to the chaplain's book options
Why It's Good For The Game

adds the option for Insulationism as a choice for the chaplain's
Changelog

cl
add: Added new chaplain book option
add: Added hypertool null rod option
imageadd: added Insuls book to storage.dmi
imageadd: added hypertool icon to device.dmi
/cl
2019-06-04 18:43:34 +12:00
Rockdtben
2d90bf1ca8 Custom HeaderText on Wanted/Missing Posters (#44260)
* Allows custom headertext

* Allow security console to use custom header text.

* Fix 'A' and max_length on input

* Update wanted_poster.dm
2019-06-03 21:15:28 +02:00
moo
c7df1a90b6 Merge branch 'master' into breathe-into-me 2019-06-02 20:26:53 -04:00