Commit Graph

12083 Commits

Author SHA1 Message Date
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
4dplanner 15825997b8 Stamina changes [TMC] (#43966)
About The Pull Request

Stamina damage no longer stacks with regular damage.
Stamina regen is paused for 10 seconds every time you take stamina damage
Stamina damage is purged if stamina regen resumes after you enter stamcrit

changes to make this work:
disablers knocked down to 30
punch damage changed to full raw, 1.5x stamina.
flesh-eating symptom deals 2x stamina damage
CQC unchanged
Bostaff manually stacks
Energised jelly blob deals full stamina damage
Pressurised slime blob deals full stamina damage
Blood boil deals 1.5x stamina damage to servants of ratvar (why do I bother?)
Revenant blight now deals 20 stamina damage
Space carp no longer deal stamina damage, but deal 20 brute.
Enchanted bullets deal 20 brute damage
Beanbags reduced to 55 stamina damage
Rubbershot damage untouched
Ebow stamina damage increased to 60

bone hurting juice deals 7.5 stamina damage per tick, down from 15
Why It's Good For The Game

Stamina damage not stacking with regular damage is meant to make disablers less good as a weapon for all-out firefights, but remain good for arresting criminals as a sec squad.

The stamina regen pause allows for chemicals that deal stamina damage to be effective even if they don't only target one body part (as in #43924), and gets rid of the counterintuitive speedy regeneration if multiple bodyparts are damaged. It also makes stamina damage calculations more straightforward - currently 4 damage/tick to the chest is really 1, and adding 25% more damage to the chem deals 100% more damage per tick.

The stamina purge is to make stamcrit less of a confirmed win - several times as sec officer I've succumbed to poison, run out of charge, etc only for the rest of sec to arrive before the perp awakes from his 3 hour sleep. Stamina damage is fully purged to make keeping someone down require more attention, since under the current system even if they somehow get up they'll be so slow it'll be trivial to put them down again. Basically, makes handcuffs more useful again.
Changelog

cl
add: stamina damage now pauses natural stamina regen for 10 seconds
add: stamina regenerates fully when it can.
balance: disabler damage reduced
tweak: stamina damage no longer stacks with normal damage for the purposes of damage slowdown and crit
balance: many sources of stamina damage have been adjusted, check PR for details
/cl
2019-06-03 11:16:56 +12:00
oranges dc80dbda7b Merge pull request #44199 from Suicidalpickles/beegirls2k19
Gauze can now be applied to corpses
2019-06-03 11:04:10 +12:00
nemvar 39820eded0 Changes grenade detonation timers. (#44169)
About The Pull Request

Makes it possible to adjust the timer of all grenades with a screwdriver.

Also makes it possible to adjust the timer with a multitool. You put ot anywhere between 3 and 5 seconds. Instant detonations are also possible.

Changes how you input the spread amount on advanced release grenades. Instead of repeatedly clicking with a multitool, it now opens a window.
Why It's Good For The Game

Makes grenades more consistent with each other. It made little sense that you could adjust the timer on flashbangs but not on smoke grenades, for example. It also gives the player more control about how they want to use grenades by letting them set the timer more accurately.

Also adds more bloat to the multitool. Exactly what this game needed.
Changelog

cl
balance: The timer of all grenades can now be adjusted with a screwdriver. Possible values are instant, 3 seconds and 5 seconds.
add: You can now adjust the timer of grenades with a multitool. You can put it anywhere between 3 and 5 seconds. Instant detonations are also possible.
tweak: Advanced release grenades now open a window if you want to change the amount of units released.
tweak: The default timer on smoke grenades is now 3 seconds.
/cl
2019-06-03 11:00:49 +12:00
Whoneedspacee 03f7432511 New RPGLoot Affixes + Component Additions (#44188)
* knockback component can now be reversed, has projectile and gun handling, and hostile simplemob handling

adds signals for hostile mobs attacking, altering projectiles before firing, and for when projectiles successfully hit their target

moves knockback handling to a general proc

adds ishelpers for guns and projectiles

* no more weird projectile handling it can just not apply the effect if the component somehow goes away

lifesteal actually works now instead of being a blank file, applies a flat healing effect when you hit something

* fixes up comsig stuff

adds new components to the fantasy prefix and suffix

knockback now handles throwing anchored objects

lifesteal now properly heals the target with projectiel weapons

adds summoning component to handle mob summoning with item attacking and such

adds fired_from variable to handle what a projectile was fired_from, firer would be the mob that fired and fired_from would be the gun, in the case of an autoturret, fired_from and firer would be the same

adds shrapnel component, fires projectiles around a fired projectile when it hits

adds igniter component to set attacked mobs on fire

* no more shrapnel on items that can't use it

summoning items now summon at least one mob maximum

adds specific weighted projectile types for shrapnel to prevent broken options being picked

removes the reverse var from knockback component and instead just handles negative thrown turf
2019-06-03 11:00:12 +12:00
kingofkosmos 1bf60bbe06 Adds missing </span>'s. 2019-06-02 21:29:14 +03:00
oranges 5be02315ea Merge pull request #44191 from AffectedArc07/removes-ss-religion
Removes SSreligion
2019-06-02 09:40:45 +12:00
oranges d1f27cf52e Merge pull request #44197 from kriskog/spamspamspam
Adds "Never for this round" to a few more ghost rolls.
2019-06-02 09:35:35 +12:00
ShizCalev c589bf8d9f Merge pull request #44236 from Rockdtben/missingPersons
Add Missing Persons Poster for security to use.
2019-05-31 17:10:16 -04: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
skoglol 7969654ad1 Moves machine/computer frames and structures below object layer. (#44165)
* Moves machine and computer frames below object layer.

* Moves structures below object layer.

* moves mineral doors to airlock layer, removes excess layer overrides.
2019-05-31 19:18:41 +02:00
Rockdtben 705152695a Add Missing Persons Poster for security to use. 2019-05-31 10:43:49 -05:00