Commit Graph

27900 Commits

Author SHA1 Message Date
oranges a90664a3d4 Merge pull request #43816 from vuonojenmustaturska/lightmagic
Move lighting queues inside the lighting subsystem
2019-05-06 17:57:33 +12:00
Qustinnus fc2966ff01 [READY] Execute Protocol Crab-17: Phase 3 - The one where Floyd actually finishes the PR (#43338)
* protocol crab 17: phase 2

* k

* meme

* fix

* k

* fixes

* more stuff

* makes qust's code not bad

* fixes time

* MFW (my face when) face when floyd doesnt make the fix commit

* makes it leave properly

* fixes more shit

* gets rid of stupid variable

* asdf

* wa la

* wa la ^2

* tadaa

* adds

* i fixed some of them but what do the others mean

* untested and ready to merge
2019-05-05 19:40:46 -04:00
py01 2c407b27a7 Fail message when you fail to upgrade grabs due to intent (#43803)
* grap fail message added

* chnages fail message
2019-05-05 13:00:36 -04:00
vuonojenmustaturska 01aef8ee82 small cleanup 2019-05-05 05:37:21 +03:00
zxaber f922f2a5a8 Unbroke manifests (#43795) 2019-05-04 13:44:32 -04:00
moo 2349ac86b1 mindswap + stand interaction (#43805) 2019-05-04 13:43:02 -04:00
Fikou c2a4f9ee5d Diagnostic HUD eyes (#43806)
* diagnostic hud

* Update autosurgeon.dm

* Update scientist.dm

* Update security.dm

* Update medical_designs.dm

* Update all_nodes.dm

* Update scientist.dm

* Update security.dm

* Update autosurgeon.dm

* Update autosurgeon.dm
2019-05-04 13:42:38 -04:00
oranges 223e5429ef clamp the biogen amount to within the limits allowed by the UI (#43792) 2019-05-03 13:20:15 -04:00
zeroisthebiggay 49a010df8a gives janiborgs the love they deserved (#43776) 2019-05-03 11:00:11 -04:00
PKPenguin321 04855c36e7 mindswap + stand interaction 2019-05-02 21:16:53 -07:00
81Denton 546592529c Adds confirmation popup to undelaying round end (#43780)
* Adds confirmation popup to undelaying round end

* Popup lists current delay reason
2019-05-02 12:17:48 -04:00
Strommer Kilian 9529063aa3 New brain trauma: expressive aphasia (#43608)
* new mutation: simple speech

* finalize simple speech and fix word list apostrophes

* Is now a brain trauma instead

* fix merge conflict

* grammer fix

* cleanup cause I'm an idiot

* made the suffix list a bit easier to read

* fix traits.dm
2019-05-02 19:48:38 +12:00
as334 aad48392d8 Adds a new minor gas reaction. (#43362)
* Adds Stimulum+Pluoxium radball firing reaction.
Lowers Nitryl formation heat requirement.
Cleans out fusion test canisters.

* Removes forgotten debug message

* Adds a clamp
2019-05-02 12:00:41 +12:00
YPOQ bf9d249a42 Fixes borg wheelchairs going super fast (#43761) 2019-05-01 08:54:37 -04:00
YPOQ ab088c94f8 Fixes strange seeds producing invalid reagents (#43762) 2019-05-01 08:54:11 -04:00
YPOQ 2f82e007ba Fixes alien husking (#43763) 2019-05-01 08:53:30 -04:00
Wilchenx afee292494 Fixes bugs related to modular pc vendors and adds pAI cards I forgot to add. (#43709)
* cate

* h

* Update modularpc.dm
2019-04-30 11:10:34 -04:00
nemvar 43657b1715 Fixes the effects of a missing liver (#43748)
* Fixes the effects of a missing liver

* Update life.dm

* Makes larvas not kill themselves

* Update life.dm

* Update life.dm
2019-04-30 11:08:36 -04:00
AnturK e87dc0a919 Adds dueling pistols. (#43489)
* Adds dueling pistols.

* Adds sprites by @MrDoomBringer

* Ok

Co-Authored-By: AnturK <AnturK@users.noreply.github.com>
2019-04-30 11:06:48 -04:00
Tlaltecuhtli e36a283b41 [ready]ghetto grinder (#43600)
* 1

* 2

* 3

* 4

* grammar

* grinds stack items + no do_after spam

* sprites

* fixix

* Update code/modules/reagents/reagent_containers/glass.dm

Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/glass.dm

Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>

* low energy

* fix

* Update glass.dm
2019-04-30 10:12:49 -04:00
skoglol 7d1d0a5d12 [s] Fixes ore satchel exploits, various storage size circumventions. (#43715)
* Fixes ore satchel exploits, various storage size circumventions.

* Woops.
2019-04-30 10:11:38 -04:00
skoglol bea6be8fa3 Makes falsewall hide pipes and wires. (#43724) 2019-04-29 12:12:59 -04:00
skoglol 8b6c1e1e9e Prevents multiple blobbernauts per factory. (#43727) 2019-04-29 11:23:38 -04:00
skoglol f97c1bc1e5 Non-station AI can no longer interact off their z-level. (#43710) 2019-04-29 10:46:15 -04:00
PKPenguin321 c59aa61596 [Ready] Punching/Grabbing Rebalance (#43291)
* initial commit

* obligatory stupid mistake fixer commit
min -> max

* moves punch changes to correct file
makes them slightly more logical as well

* minor tweaks (see msg for details)
- fixed some defines i messed up when conflict fixing
- removed some unneeded typecasting and src calls
- bumped up stamina damage on failed grab resist so it's not as outpaced by stam regen

* better use of defines/logging

* last second fix to stun punch threshold
forgot to raise it by 1 to account for raising the human punch damage max
also, log missed punches

* Update code/modules/mob/living/carbon/human/species.dm

Co-Authored-By: PKPenguin321 <pkpenguin321.git@gmail.com>

* Update code/modules/mob/living/carbon/human/species.dm

Co-Authored-By: PKPenguin321 <pkpenguin321.git@gmail.com>

* Update code/modules/mob/living/carbon/human/species.dm

Co-Authored-By: PKPenguin321 <pkpenguin321.git@gmail.com>

* Update code/modules/mob/living/carbon/human/species.dm

Co-Authored-By: PKPenguin321 <pkpenguin321.git@gmail.com>

* addresses review
2019-04-29 10:45:38 -04:00
81Denton 22ad912f41 AIs no longer get stuck on death (#43731) 2019-04-29 10:21:22 -04:00
carshalash 10ba9a25bd Pressurized Slime: Buff to oxygen and SILICON components (#43689)
* Update blob_reagents.dm

* Update blob_reagents.dm
2019-04-29 10:19:15 -04:00
Tad Hardesty 9183a6f66b Clean up workaround for fixed compiler bug (#43698) 2019-04-29 10:59:28 +02:00
RaveRadbury 6db1f7ba0a included hud_type for pAI that was lost (#43721) 2019-04-26 20:50:51 -04:00
tralezab 576606d1c4 zombies can eat brains (#43705)
zombies can eat brains (claw zombies will need some help!)
2019-04-26 12:20:09 -04:00
mikolaj007 00ceb257b0 Fixes Adminordrazine not giving blood back (#43704)
* Fixes bloodloss

* Update medicine_reagents.dm
2019-04-26 11:55:39 -04:00
Dax Dupont fec3550529 Fixes clown health (#43703) 2019-04-26 11:55:20 -04:00
RaveRadbury 701d0c78c0 [READY] pAI Journalism Update (#43654)
* Fresh start

Wow this has been an adventure. Hopefully this works and I can start rebuilding this PR.

* Functional build

Lacks software integration, costs, purchase enabling, etc.

* Removes pAI Action HUD

Also changes some frame data on icons, slowing them.

* adds check for pAI in newscaster.dm

* tweak job title for consistency

* capitalization

* correctly types pai in newscaster.dm

Co-Authored-By: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>

* adds in wire fix PR vars to hopefully fix it all

* reset pai.dm to hopefully fix this replace issue.

* That didn't fix anything. Reverting.

* One more time, taken from upstream master.

* put the newscaster stuff back into pai.dm

* Re-adds job title for newscaster
2019-04-25 14:10:43 -04:00
Austin Rickli cd24e9feff Fixes Hilbert's Hotel from being able to enter itself. (#43602)
* Prevented Hilbert's Hotel from being able to enter one of it's own rooms.

* Because apparently "niche features" are required...

* Apparently this is better?

* A Final Compromise...

* Return of the Parenthesis
2019-04-25 12:45:20 -04:00
tralezab 094b1aaa11 Hey, Melone! You there!? (#43680)
Tell me, why the fuck is the embed chance 100% but the throw speed below the threshold for embedding!
2019-04-25 18:26:12 +02:00
zxaber 264a1ae108 [Ready] Cargo Catalog small-order support, new single-pack orders, addition of Ripley (#43402)
* Initial changes

* I need my scratchpad for another PR real quick

* Access and code shuffling

* First pass at small_item markers

* Second pass at small_item markers

I think I did this right...

* Maybe I should save the files I have open

* small pack additions

* Update tgui.js

* Removing some (imo) redunadant packs.

* removing 1911 pack

press F to pay respects

* missed a debug

* reorganization

* bit of cleanup

* removed some leftover disabled code

* That red X is bullshit and you know it
2019-04-25 12:25:12 -04:00
Jordie 37edab7b9a db connection checks for player age and job exp (#43667) 2019-04-25 12:13:48 -04:00
Rob Bailey f1e30c8549 Update augmented_eyesight.dm (#43691) 2019-04-25 12:10:58 -04:00
AnturK 180c87f8e0 Fixes transforming weapons resetting their throw speed. (#43684)
* Fixes transforming weapons resetting their throw speed.

* mhm

* Let's make this simple.
2019-04-25 12:09:34 -04:00
RaveRadbury 188f77b493 [READY] Fixes pAI radio disabling (#43634)
* Untangles code that was trying too hard.

It tried to use "wires" to handle both wires and it didn't work.

* Adds two variables to make it all work.

* dropped an else

* Found out how I dropped an else. Fixed

* Changes can_tx and can_rx to longer names

* more descriptive var names

* How did I miss these deletions?

* Then I don't move the ", geeze.

* Adds Cobblestone's suggested code.
2019-04-25 08:19:13 +02:00
nemvar 49c42c63d0 Nerfs surplus russian gear. (#43688)
* Passive aggressive nerfs

Yeah no. Those values were retarded

* Update syndicate.dm

* Update armor.dm

* Update packs.dm

* Update packs.dm

* Rad protection for helmets.

* Life in the zone is hard
2019-04-24 20:02:39 -04:00
Dax Dupont b13d244d76 Adds new clown mobs for admin use (#43675)
* new clown mobs and spawners

adds several new types of clown mobs, a beacon to spawn them, and a honkrender that spawns clown hulks

* added more clown varieties and fixes to previous

* fixed unneeded capitalization and changed mob values

removed unneeded capitalization and text errors and altered mob attack values to create more variation. Honkmunculus now does very little damamge but injects a small amount of meth.

* Update clown.dm

* clown changes and new clown

new clown that spawns bananas. can leave large stacks if left unattended, so it may require some reworking. nerfed several overpowered clowns and gave chlown a beetle like stride

* added cluwne to uplink, fixed redundant variables, added new clowns

cluwne can now be purchased for 5 telecrystals as a clown exclusive uplink item. Bananas were greatly improved. new weak clown added. Gave some clowns extra parents to reduce variables.

* Update code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm

Co-Authored-By: Pugnacious-Gnome <48869928+Pugnacious-Gnome@users.noreply.github.com>

* IT LIVES ONCE MORE

* forgive me for this sin

* i wish git would detect case changes

* this works
2019-04-24 18:13:57 -04:00
RaveRadbury 8dcfdff576 [READY] pAI's have headsets and can use encryption keys (#43603)
* pAI's have little AI headsets and can use encryption keys.

* pAI's now spawn radio AND headset.

Reverted radio code and changed new variables to the new headset var

* Undid the comment out of radio code.

As far as I can tell this isn't working properly though. Tried testing it locally and can't enable/disable radio as pAI or master.

* Removed redundant null keyslots.

* Final version

It should all work.

# Conflicts:
#	code/game/objects/items/devices/radio/headset.dm
#	code/modules/mob/living/silicon/pai/pai.dm

* Merge

* Mergies

* Update code/modules/mob/living/silicon/pai/pai.dm

Co-Authored-By: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
2019-04-24 11:30:27 -04:00
AnturK d81ff09046 Atmos adjacency subsystem revival (#43447)
This improves init times and makes explosions and other shit that modifies a bunch of turfs faster by saving a proccall and potentially not doing the same work more than once.

cl Naksu
code: Turf adjacency list updates are now handled by a subsystem queue
/cl
2019-04-24 21:21:25 +12:00
Wilchenx 7e4946d0f0 Adds a new Modular PC vendor (#43642)
* b

* s

* Update packs.dm

* Update modularpc.dm
2019-04-23 16:26:05 -04:00
Mickyan 268316731f [READY] Adds the Empath and Friendly quirks (#43651)
* things

* newliiine

* better text
2019-04-23 15:00:14 -04:00
Time-Green 48370e5a35 Adds the fat extractor (#43337)
* Adds the fat extractor

* adds emagged option

* new icons and fixes

* update light

* adds a fucking comma

* Update code/game/machinery/fat_sucker.dm

Co-Authored-By: Time-Green <timkoster1@hotmail.com>

* name constistency

* Update code/game/machinery/fat_sucker.dm

Co-Authored-By: Time-Green <timkoster1@hotmail.com>
2019-04-23 13:15:10 -04:00
Rob Bailey 3caaabfd11 [s] Fixes an exploit involving tactical reloading (#43664)
* typo

* better logic
2019-04-23 11:29:58 -04:00
Tlaltecuhtli 1dafc07331 Removes 1-shot Stamstuns From Shotgun Ammos (#43572)
* \

* beanbag
2019-04-23 10:59:12 -04:00
Kierany9 e10458d6b9 Modifies how the Assimilation pinpointer radars work (#43575)
* Update hivemind.dm

* Update radar.dm
2019-04-23 11:14:08 +02:00