Commit Graph
54249 Commits
Author SHA1 Message Date
QwertytofortyandGitHub aea846c761 you can no longer attack c4 to ghosts (#18418) 2022-07-17 22:22:43 +01:00
VizandGitHub cb066d1dd9 disrespect (#18405) 2022-07-17 22:22:21 +01:00
ContrabangandGitHub 0731101549 Gives cablecuffs and cables customizble colors, cablecuff(ed) sprites, and allows orange cables to spawn randomly (#18318)
* coloooors

* this should work

* bam, better colors

* fuck i didnt mean to delete the cueball

* cuffed state comment
2022-07-17 09:57:13 -05:00
KalevTaitandGitHub 694944e461 Code Readability - Power (#18245)
* power

* dissipate -> do_dissipate

* eye_protection =

* move APC charging #defines out of apc, and reference them in more places
2022-07-17 15:36:46 +01:00
LumiandGitHub 391a044df1 Grammar fixes (#18342)
* grammar fixes

cant - can't
removes duplicate the from mobs
the pain in your the -
treads on the lit the lit -
what you can cook with this the -

* should fix the merge conflict

0 to FALSE

* unconflicts

panther will have to be fixed at a later date
2022-07-17 15:36:03 +01:00
QwertytofortyandGitHub c2db9cbd65 Moves ED209 / security bots to stamina batons (#18232)
* Moves ED209 / security bots to stamina batons

* Buffs Bot health to compensate, secbots no longer have projs fly over them

* varset_callback
2022-07-17 15:32:27 +01:00
Bm0nandGitHub 4da179b236 Disable BYOND macros and a few other things users shouldn't have access to. (#18374)
* time to die pickup macro

* code review
2022-07-17 13:30:43 +01:00
QwertytofortyandGitHub 3f48ad2111 fixes simple_animal/construct (#18410) 2022-07-17 13:15:17 +01:00
64dd5d88b0 NanoMap Auto-Update (Sun Jul 17 02:10:32 UTC 2022) (#18412)
Co-authored-by: NanoMap Generation <action@github.com>
2022-07-17 13:13:27 +01:00
Shadow-QuillandGitHub 496944531d Makes the AI repairer check whether the AI is dead (#18382)
* Makes the fix button check whether the AI is dead, as well

* Minor tweaks to two let/if/else statements

* Minor fixes

* Repack TGUI Bundle
2022-07-17 11:56:10 +01:00
Sirryan2002andGitHub ac5f39f822 I am unhinged (#18393) 2022-07-17 11:53:48 +01:00
VizandGitHub 9596e6c9fc Zzztt... (#18389) 2022-07-17 11:53:34 +01:00
6d6af3742e Adds descriptions to library manuals (#18380)
* Adds descriptions to library manuals

* I swear, I can type!

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update code/game/objects/items/weapons/manuals.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-07-16 21:46:09 -05:00
ChristasmurfandGitHub 51c1ef55ee Engineering Drip Lite™ (#18231)
* Merge remote-tracking branch 'upstream/master' into engiclothingpack

* In hand sprites

* satchel fitting
2022-07-16 20:39:26 -05:00
SteelSlayerandGitHub 2881a03096 [TGUI] Biogenerator + refactor (#18263)
* tgui biogenerator

* moxian and sirryan review

* moxian review II

* charlie review
2022-07-16 22:41:57 +01:00
18a440a9bb Adjusts 15 berets and 9 other pieces of headwear to properly fit vox heads, part 1 (#18221)
* Chef hat fix

* Revert "Chef hat fix"

This reverts commit 645d08afdd.

* Alphabetizes vox head icons

* Repositions, recolors, and fixes vox headwear

* Adds code so the headgears actually show up

* Adds blockhair flag to bandana

* Revert "Adds blockhair flag to bandana"

This reverts commit ca47ba5000.

* Removes bandana vox code

* Removes the bandanas, will be done in another PR

* Removed superfluous sprite sheet declarations

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/clothing/head/misc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/customitems/item_defines.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-07-16 15:24:00 -05:00
Sirryan2002andGitHub 331abddcaf PAI's no longer runtime when suiciding (#18369)
* PAI's no longer runtime when suiciding

* WAGH
2022-07-16 15:40:08 +01:00
VizandGitHub a02909497a at long last this weapon is not bonkers (#18388) 2022-07-16 15:36:39 +01:00
QwertytofortyandGitHub 45f6f14c64 Now follow up with a glory kill (#18387) 2022-07-16 14:39:13 +01:00
Vi3triceandGitHub 6dfaca81de Well no one's doing it (#18398) 2022-07-16 11:11:36 +01:00
LightFire53andGitHub f7bd6c2850 Remaps DeltaStation Arrivals for Better Shuttle Docking (#18226)
* Docking Clearance

* Arrivals Renovations

* Bye bye airlock

* Lattice Time

* Classic post pr posting tweaks

Featuring yours truly

* Fills more space

And maybe CI won't fail randomly?

* No Parking Zone

* Denth Request
2022-07-16 02:05:12 -05:00
KugamoandGitHub 3bfd1a6d8a Foggy Breath Effects (#18241)
* chilly

* frosty

* Now with crawling and buckling!

had to do some jank because meat spikes dont change a perfectly good variable that other angle changing code uses, so insert snowflake code for the meat spike. :C

* Fixes warning

what the hell is a protected variable anyways

* amogus

* Revert "amogus"

This reverts commit ebaa99c77b.

* megafauna PR deconflict

* removes jank

* needless variable def
2022-07-16 00:45:45 -05:00
493571b901 fixes some issues with whetstones (#18307)
* fixes some issues with whetstones

* merges / simplifies / reorders

* can compress more.

* Active / wielded is no longer needed

* Update code/game/objects/items/weapons/whetstone.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-07-16 00:04:19 -05:00
dragonpan2andGitHub 1dc0669e12 expanded plastic crafting (#18281) 2022-07-15 20:32:48 -05:00
Farie82andGitHub b5c9a3bc79 Makes the lavaland shuttle not spawn space when destroyed. Makes shuttles not take space/lava/chasms with them on transit (#18194)
* Makes the lavaland shuttle not spawn space when destroyed
Makes shuttles not take space/lava/chasms with them on transit

* Ensures damaged shuttle turfs still can be repaired after launch
Makes sure flooring has proper icons set
2022-07-15 18:53:03 -05:00
CharlieandGitHub 5e1ad2b560 Reworks disarms into shoves, mostly from TG (#18186)
* Disarm rework

* martial arts should work

* farie review

* bug fix + sound

* fixes all the things

* fixes diagonals

* fixes anchoring, buckling and adds feedback messages.

* fixes blockers ontop of tables

* grammar + tabling fix

* steel review
2022-07-15 13:14:38 -05:00
CharlieandGitHub 707a92c46d Rebalances antistun chems (#18084)
* rebalances antistun chems

* missed some

* oops

* tweaks

* makes adrenals heal shock and heart failure

* typo

* moxian review

* aaaaaa

* I FORGOR

* steel review
2022-07-15 11:09:40 -05:00
acc48358b4 Adds a new mecha-fauna to lavaland. Ready to TM (#17999)
* pain

* more progress

* progress continues

* more progress™️

* saving progress while I swap brances

* leg moving working for real, woo

* more saving as power goes out

* eeven more

* fix transfer

* More changes, closer to pr ready

* final stuff for night backup

* almost done™️

* almost done

* Final changes to get ready for posting

* Update code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* new sprite

* Loot added (minus crusher loot)

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Defines, loot, and requested changes, oh my!

* Apply suggestions from code review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* sound, bluespace charge improvements, more text

* Update code/game/gamemodes/nuclear/pinpointer.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* WOOO CRUSHER ITEM

* don't code when dead tired kids

* Update code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Makes crusher loot work, reworks shield for mecha fauna

* Names it, lets it spawn, buffs it, should be ready.

* Adds better sprites.

* pick to rand

* Buff, prevent cheese.

* Merge conflict hook test

* double checking to see if I installed it or not, think I need to manual

* fixes the merge issue

* makes gibtonite not yeet the mechafauna as much.

* fixes hostile/hostile fuckup

* fix most beam issues

* extra qdel insurance but it should be good

* fixes chasm issues, beep on self destruct, extra bluspace charge

* Shrinks the kaboom.

* spelling + beam fix

* Apply suggestions from code review

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* late_initialize, var names, and styling, oh my!

* attacl

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-15 15:28:07 +01:00
ContrabangandGitHub 813e88a8cb Changes body collision to knockdown, adds a throw_range of 4 to carbon/human (#18363)
* Begone Weaken()

* throw range

* little spacin is good

* requested changes are changed
2022-07-15 15:16:23 +01:00
VizandGitHub 6eec8f9115 several skrell were hurt testing this (#18390) 2022-07-15 15:16:09 +01:00
Bm0nandGitHub dd1be67ebd Ports Goonstation solar panels (#18326)
* the goons have put me on their hitlist

* whoops i messed up the teg

* FORGOT TO REDELETE THE OLD TRACKER
2022-07-15 11:45:12 +01:00
Bm0nandGitHub dbf2afcdd4 AHHHHH FIRE (#18311) 2022-07-15 11:44:59 +01:00
Bm0nandGitHub c0c8287ed3 I LOVE GITHUB!!! (#18308) 2022-07-15 11:44:16 +01:00
EdanandGitHub 166d7f3b61 Nerfs beanbags & rubber pellet shots (#18287)
* initial nerf

* rubber shot changes
2022-07-14 23:22:19 +01:00
VizandGitHub a7300d6199 splash one awful gun (#18357) 2022-07-14 23:20:53 +01:00
Mr.GustavoandGitHub a13800f02a My ears (#18358)
changes the sound effect for the drill
2022-07-14 23:19:49 +01:00
SinestiaandGitHub 81fa49b27f Makes plastic output vary based on inputs (#18359)
* Plastic is no longer a fixed-output reaction

* Buff plastic
2022-07-14 23:19:32 +01:00
VizandGitHub bd80aa4e22 WAKE UP OUTTA YO SLEEP (#18360) 2022-07-14 23:18:39 +01:00
QwertytofortyandGitHub b4677d2f06 You once again must stop drop and roll. (#18258) 2022-07-14 22:06:20 +01:00
LucandGitHub 9e1fede4cb Fixes some emote logging (#18385)
* Add some missing logging calls

* at least it wasn't a webedit
2022-07-14 21:02:01 +01:00
AdriandGitHub 4d60afa7df Fixes MetaStation not having a magistrate stamp (#18223) 2022-07-14 17:16:23 +01:00
LightFire53andGitHub 9e72f9c5da Removes Nazi Germany Imagery from the Game (#18210)
* Invokes the Treaty of Versailles on Clowns

* Of course there were Vox sprites

* Conflicted
2022-07-14 17:15:34 +01:00
AffectedArc07andGitHub 0c0b201668 Reworks anon dchat mode into full anon mode (#18282)
* Reworks anon dchat mode

* Update code/modules/client/preference/preferences_toggles.dm
2022-07-14 16:52:49 +01:00
KugamoandGitHub 490de764de colored belt cables (#18303)
😎
2022-07-14 16:52:35 +01:00
QwertytofortyandGitHub 3a3ee0941c fuck I am dense (#18377) 2022-07-14 14:53:26 +01:00
ContrabangandGitHub 69064951e9 goodbye oversight (#18375) 2022-07-14 12:32:43 +01:00
Shadow-QuillandGitHub ced4e1f1e3 Fixes not being revived if a ghost enters the body during a defib (#18371) 2022-07-14 11:01:49 +01:00
ContrabangandGitHub 4ab98ea3f8 Cultists can now reliably find their cult dagger (#18367)
* cult find thing good

* return null

* extra space be gone
2022-07-14 11:01:02 +01:00
Sirryan2002andGitHub dcb4d43e5c Fixes Improper usage of tool_use_check proc (#18362)
* fix

* better implementation
2022-07-14 00:22:45 +01:00
SteelSlayerandGitHub f9b2a2b67e antag_datums GC fixes (#18321) 2022-07-14 00:22:25 +01:00