Commit Graph

11328 Commits

Author SHA1 Message Date
ATH1909 21909e2733 Makes borg buckling conflict less with inventory searching (#46364)
About The Pull Request

This PR finally splits up the ways that borgs are supposed to initiate inventory checks of a mobs and initiate attempts to buckle mobs to themselves (formerly, they would both happen upon click+dragging a mob onto yourself as a borg). Now a borg will only try to buckle a mob to themself if they ARE NOT on harm intent when they finish click+dragging said mob onto themself, and will only try to check a mob's inventory if they ARE on harm intent when they finish click+dragging said mob onto themself. An outsider can still buckle someone (even themself) to a borg who's on harm intent; the borg just can't do it themself.
Why It's Good For The Game

This issue is incredibly annoying to deal with as a borg (especially if you're in an area or situation where *spinning someone off of you could be risky), and I'm really surprised that it's taken this long for this control conflict to be fixed.
Changelog

cl ATHATH
tweak: If a cyborg click+drags someone onto themself, they will only try to buckle that person to themself if they (the cyborg) ARE NOT on harm intent. Attempts made by non-cyborgs to buckle themselves to cyborgs by click+dragging themselves onto said cyborgs should be unaffected by this change, even if those cyborgs are on harm intent.
tweak: If a cyborg click+drags someone onto themself, they will only attempt to check that person's inventory if they (the cyborg) ARE on harm intent.
/cl
2019-09-16 16:36:13 +12:00
Fikou a439c6ac37 makes the ed209 a child of securitrons instead of a horrifying copypaste (#46230)
About The Pull Request

does what says on title, becomes a securitron that can shoot people
removes ed209 cell because it doesnt do anything why does it even exist
fixes ed209 crafting using dragnets
sadly, removes lasertag mode from ed209, but ive never seen anyone use it and it made everything a lot more confusing
eds now shoot you even if youre lying down because i guess that you could rest before to avoid getting shot but im not 100% sure
Why It's Good For The Game

fixes tons of horrifying copypaste
also fixes some minor things
Changelog

cl
del: Lasertag EDs have been removed
code: EDs are now not a horrifying mess of copypasted securitron code
balance: EDs now still shoot you if you're lying down
tweak: you no longer need a battery to make an ed209
fix: fixes ed209 crafting using dragnets instead of disablers
/cl
2019-09-16 16:33:19 +12:00
Mickyan e9116fcace Moves drunk healing to quirk process (#46507)
* drunk coding

* removes redundant check
2019-09-15 19:00:11 -04:00
nightred dc23d15170 Blindness removes your ability to see colours (#46475)
* Blindness removes colours so you can only see if an object is near, not the fine points on it.

* Fixed up the monochromatic trait to persist when removing blindness

* Removed added trait and created new colour filter for blindness

* Blankspace Removal

* removed the src before the proc as it was not needed
2019-09-15 00:34:21 -07:00
variableundefined 900483ba44 Remove redundant structure/chair/wood/normal typepath (#46443) 2019-09-15 00:29:23 -07:00
spookydonut 00fa882721 Changes some typed loops to typeless loops (#46444)
* typeless loops

* new_player

* eol
2019-09-15 00:26:55 -07:00
Nichlas Pihl 39d3cce714 Fixes a runtime (#46432) 2019-09-14 23:58:08 -07:00
skoglol ee7306b4ea Projectile effects no longer ignore armor. (#46419) 2019-09-14 23:57:37 -07:00
kingofkosmos 8358169b8e New 'hear' span class (#46369)
* Reverts italics-span back to no color.

* Cleans up many extra spaces and indents.

* Adds 'hear' span class.

* Replaces all 'italics' used in heard messages with 'hear'.
2019-09-14 23:56:34 -07:00
Unknown df76d0dbb2 slip 2019-09-14 22:56:28 +02:00
Qustinnus 9812834054 Adds knight armour to the game that can be made from any material (#46301)
* Adds knight armour

* fixes armor

* nerfs & fixes

* adds ruin

* done

* bug

* oh im a buddy

* rad

* ok nem

* fix sprite

* fixes

* tgm

* epic

* re-adds icons

* fixes list

* ok ninja

* fixes

* fixed

* woops
2019-09-14 15:32:29 -04:00
Dingo-Dongler 319df6f554 Makes nanites be passed down when jellypeople and slimes split (#46283)
* Makes nanites be passed down when jellypeople and slimes split

* Trying to change how nanite splitting works, currently this is broken and disallows splitting of slimes and jellypeople

* Still doesn't work, jellypeople code fails at the L1 check

* Nanites now pass on properly, but sync needs a rework. Get component might be the right way to do it after all

* preparing for revert

* Reverting, I think

* I don't know how revert works, making activation copy over as well

* Removing an unneccesary proccall
2019-09-14 14:26:36 -04:00
Fikou 259ebdcc5d makes bonespear a child of spear and MAKES THE DAMAGE MORE CONSISTENT (#46467)
* who did this

* boner

* a

* a

* hhhhhhhhhhhhhhhhhhhhh

* a

* a

* Update recipes.dm

* hhhh
2019-09-13 18:36:10 -04:00
GuyonBroadway a5e24c0205 Makes chocolate less of an instant taser and more of a poison. (#46366)
* Less puke, more DIE

* Sickness messages and better probs.
2019-09-10 16:27:43 -04:00
kevinz000 6c50583b34 Fixes VV renaming (#46410)
* vv fix

* forgot the define
2019-09-10 20:13:09 +02:00
Rodey125 051ec9ffe4 Adds AttackingTarget() to ranged holoparasite (#46412)
* Adds AttackingTarget() to ranged holoparasite

* removes some shitty code
2019-09-10 11:58:09 -04:00
moo eb4894f668 Medbot-Bros Fixes / Adds Trait Callbacks (#46341)
* Update medbot.dm

* romance of the three medbots

* no longer requires unique ID

* Revert "no longer requires unique ID"

This reverts commit 3349140f3779f8e694e14d1c2a170ff5d3105a56.

* sometimes i can code ok

* Update medbot.dm

* duh

* Update unsorted.dm

* Update unsorted.dm
2019-09-09 17:30:22 -07:00
Qustinnus 8599d84d1d The science department now gets a mood bonus for petting borgs. (#46296)
* adds mood event for petting borgs

* oranges suggestions

* indented too far

* woops

* ok unit test chill out
2019-09-08 03:34:02 -07:00
skoglol c56f5937e2 Buffs stamcrit (#46323)
* Buffs stamcrit

* Now drops you deeper instead.

* Prevents stacking if high.
2019-09-07 23:45:45 -04:00
MacBlaze1 3021c27f35 Resubmmited alternate PR for Pepperspray rework, Fucked up my repo (#46342)
* Fuck Git pushing and Fuck Git pulling

PR machine broke, had to resubmit

* Update food_reagents.dm

* Major fixes and error fixes for nemvar

* fixed a missing type path part

* expanded scope of protection while increasing protection needed

* spacing error

* adds new variable, pepperproof to check for immunity to pepperspray

* adds another protection variable EYESPEPPERPROOF

* Revert "adds another protection variable EYESPEPPERPROOF"

This reverts commit b9f3682f7c47a157008d565620f8cdcffece145a.

* fixes and reverts to better and easier time

* small formatting fixes

* null checking

* Update living_defense.dm
2019-09-07 20:21:12 -04:00
wesoda25 d429a7616a War on Stuns Ch 8: Fuck Flashbangs (#46221)
* BURAB

* asd

* sowwy

* Update flashbang.dm

* Update code/game/objects/items/grenades/flashbang.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2019-09-07 16:22:41 -04:00
carlarctg 4e906278ae Syndicate combat defib buffed, has unique sprites (#46115)
Combat defibrillator has halved recharge time. This allows it to both 
stun people more quickly, and actually be able to cause a heart attack 
with harm intent during the stun.

It also has unique, mediocre sprites by Me. Syndicate duffel bag 
sprites altered slightly so the little med/ammo icon is tilted.

I randomly found out combat defibs could actually be used offensively 
while testing things, but they were both a tad slow to recharge and had 
what was practically an undocumented feature that I've never seen 
anyone use. This PR points out that they can be used in combat, and 
buffs them appropriately so a nuclear operative could reasonably use 
it, at the cost of sacrificing their belt slot and their offhand.
2019-09-06 21:10:33 -07:00
nemvar 1ead3e8ae7 Fixes morph movement and replaces magic numbers. (#46358)
* fixes morph speed shizz

* fixes morph movement
2019-09-06 16:23:28 -07:00
cacogen 1f010e7144 Selectively randomisable characters (#46108)
* Selectively randomisable characters

* it's a list now

* this doesn't work

* it's totally fucking fucked mate big time

* it works

* so sick of this goddamn pull request and yes i know this is a retarded way to do this it didn't work the other way

* anturk forestalls the inevitable suicide

'associative lists are more performant'

* final changes anturk requested

'remove all the "in randomise" and it's ready'
2019-09-06 08:50:12 +02:00
GuyonBroadway 1e5ba93ccc Makes it so chocolate doesn't last inside felinids forever. (#46339)
* Makes it so chocolate doesn;t last inside felinids forever.

* Guyon has high int but low wis
2019-09-04 23:58:10 +02:00
GuyonBroadway d2d82b5130 Makes felinids die from chocolate. (#46238)
* Makes felinids die from chocolate.

* tabs wew

* Return parent

* Moves code to felind.dm

* removes ded code from felinid.dm
2019-09-04 23:29:43 +02:00
Fhaxaris 6e5fd483b6 duplicate code removal (#46308)
About The Pull Request

removes duplicate if statement in a switch that is there for no reason. It already happens on line 95.
Why It's Good For The Game

???
Changelog

cl
code: removed duplicate code
/cl
2019-09-03 21:48:50 +12:00
ATH1909 432dd05eb7 Adds androids and synths to the lists of species that pride and magic mirrors can turn you into (#46204)
* Update android.dm

* Update synths.dm
2019-09-02 23:56:38 -07:00
Fikou 25326f32dc Adds the Snow Golem (#46205)
* sno golem

* sno golem

* snow golem

* carrot gang

* fix gang

* weather immunity

* haha i forgot traits

* snowflake spell

* meh

* custom sprites

* oops

* a

* sprites

* ok

* traits

* better sprites

* betterer sprites
2019-09-02 23:51:45 -07:00
nemvar 0ef8d32c91 Turns digital camo into an element (#46134)
* Turns digital camo into an element

* Removes commented out code.

* Keep forgetting this

* Update code/datums/elements/digitalcamo.dm

Co-Authored-By: Rob Bailey <actioninja@gmail.com>
2019-09-02 23:49:58 -07:00
skoglol 86839addb9 Pulling lockers now slow you down. (#46216)
Pulling lockers now slow you down.
2019-09-02 18:32:54 -07:00
Fikou bbd40be661 Gives all borgs extinguishers (#46276)
* extinguishers for all borgs + emag

* nevermind

* ok
2019-09-01 13:55:20 -04:00
wesoda25 b9e30ec6d0 Unmention Nar'Sie in purified artificer description (#46253) 2019-09-01 10:36:25 -07:00
ATH1909 aecc4c5295 Nars-Ians no longer eat each other's souls (#46245)
* Update dog.dm

* Update dog.dm
2019-08-31 21:57:11 -07:00
Dawson1917 cfc02eaf73 ED-209's aggro when you throw things at them and no longer die to shocked grilles (#46209)
* ED209's aggro when you throw things at them and no longer die to shocked grilles

* fixed an extra line

* runtimes in the waiting

* runtimes cant stop the law
2019-08-31 21:56:23 -07:00
Rob Bailey 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
bgobandit 8fb17108fa You can no longer give the AI laws containing IC filtered words. (#46072)
* You can no longer give the AI laws containing IC filtered words. Adds a proc to accomplish this.

* turns proc into a define, adds it to hacked module because I forgot
2019-08-29 15:58:20 -04:00
nemvar b5ecb5fdd8 Ian no longer nuzzles himself (#46128) 2019-08-29 10:19:21 +02:00
Rob Bailey 83654b97cb Under dmi split (#46166)
About The Pull Request

Splits the previous single dmi used for all under items/uniforms into 17 separate dmis
Why It's Good For The Game

makes icon conflicts when developing much less likely.
2019-08-28 11:07:06 +12:00
tralezab aec7efb516 fixes cursed moths (no wings) (#46158)
* cursed

* rgwgawrgaewgawrerhaethej cjgj

* okay final commit
2019-08-26 18:07:11 -07:00
tralezab 01ceb75633 [READY] Gives crabs their own meat + recipes (Revived edition) (#45973)
* guess it wasn't a fix huh

* crab motherfucking rangoon
2019-08-26 20:19:22 +02:00
kingofkosmos df1fecc58c Adds notice-span to visible_messages with no spans (#46044)
About The Pull Request

Adds 'notice' span class to all visible_messages which had no span class, making all those black messages blue.
Why It's Good For The Game

This should help differentiate action-messages from talking-messages in the chat. More actions will be blue, thus black talking-messages should pop out more.
2019-08-26 20:50:00 +12:00
nemvar 7edab00a57 Renames/Moves a bunch of mech variables and defines as well as moving tool acts to tool act. (#46000)
Changes some stuff in mech code:

state renamed to construction_state

magic state numbers changed to defines

mechadefines moved into their own file as well as putting a MECHA in front of every single one to avoid conflicts (a define just called MELEE is a dumb idea)

tool interactions in attackby moved to tool_acts
Why It's Good For The Game

I still haven't given up on saving mech code.
2019-08-26 20:45:34 +12:00
skoglol 725597cd12 Make Kosmicheskaya Stantsiya 13 great again (#45965)
About The Pull Request

Drone shells have been refactored to use mob spawners, and now show up in the ghost spawner menu. Seasonal hats were sacrificed in the process. The spawners are also anchored to prevent players moving them off the derelict.

The derelict drone flavor text and laws have been relaxed slightly, and made more clear as to whats allowed for derelict drones in particular. Effectively: drones are not allowed to leave KS13, the no interaction restriction has been limited to sentient beings, and interaction is now allowed while on KS13. Going to the main station for any reason is explicitly disallowed.
image

The derelict itself has gotten a slight overhaul to make fixing it slightly more feasible. There is a vault you can get into after setting up power which contains materials to help fix KS13. The amount of air mix has been greatly increased.
Why It's Good For The Game

The derelict has great potential for allowing players to learn about construction, as well as taking up the challenge of properly fixing the station. These changes makes that more realistically achievable without relying on random asteroid spawns close by that you werent really supposed to go harvest from.
Fixes #30379
Changelog

cl Skoglol & Naloac
tweak: Make Kosmicheskaya Stantsiya 13 great again! No I mean it, go do it. The derelict has gotten a slight overhaul, and it is now more feasible.
tweak: Derelict drones has had their laws laxed slightly while on the derelict. It should now be harder to be forced into breaking them.
refactor: Drone shells are now mob spawners and show up in the ghost spawner window.
/cl
2019-08-26 20:39:20 +12:00
Rob Bailey 26b04ede42 Obliterates item_color: new washing machine functionality edition (#45961)
About The Pull Request

Completely removes item_color and the clusterfuck of bad programming it caused.

In places where item_color was used for entirely unique purposes it was split off and renamed to a new var on that typepath only, or refactored so it wasn't needed

In places where item_color was used as a dye color, it was converted to the new dye_color var

In places where item_color was used as the worn overlay it was removed and instead now icon_state is always used as the clothing overlay.

A new mob_overlay_icon var was added for manually setting where the mob overlay icon path is for specific items.

Moved some mob overlay files relating to clothing to their own directory as well for organization purposes.

Totally refactors washing machines, instead of the horrible abortion that was iterating through the typepath it now uses a registry of dye results.

Some bonus functionality to come out of this:
the washing machine now supports arbitrary dye colors.
Why It's Good For The Game

It's been 4 years since the "this should be deprecated soonish" comment was added, and this var is a shitpile of confusion if you just trace the usage of it.
Changelog

cl
add: Washing machines now support arbitrary dye color
add: Washing machines now dye nearly every item.
refactor: lots of backend changes to clothing overlays, report any issues
/cl
2019-08-26 20:38:11 +12:00
tralezab aaca9360b8 [READY] LIZARD WINGS for the flight potion, flight potion no longer makes you new species (#46037)
* HEY RACISM GOT A SPRITE ACCESSORY FOR YA

* angel + dragonborn > givespeciesflight

* more review stuff

* last of the review stuff

* compile

* readds my fix

* Boolean numero uno

* Boolean numero dos
2019-08-24 00:11:25 -07:00
loser 819c6998cf epic (#46035) 2019-08-23 16:43:52 -07:00
tralezab 946d661dd0 smol fix (#46031) 2019-08-23 16:40:59 -07:00
Rob Bailey dd1c77192c actually fixes the mulebots for real this time (#46078)
* FUCK

* i hope this doesnt break everything
2019-08-23 16:37:05 -07:00
plapatin f0af07b498 i hope this doesnt break everything 2019-08-23 15:51:14 -07:00