Commit Graph

46142 Commits

Author SHA1 Message Date
ShizCalev 98fd2f6b8d Fixes bad default ethereal preference color (#42756)
* Fixes bad default ethereal preference color

* Fix
2019-02-14 21:15:33 +11:00
MrDoomBringer e011cfe62b [RED LABEL][TESTED][SINGLE][READY][2][MINGLE] Adds an Supplypod Launch Bay specifically for ERTs or Deathsquads (#42614)
* reeling it in

* Revert "reeling it in"

This reverts commit 2b795a8baf5eec89fdc1e6b6a6ef9d36276c2e62.

* adds the room

* makes the boobs more seeable

* WHAT IS CONSISTENT PROC NAME FORMATTING FUCK FUCK FUCK

* adds fluff sign and fixes map a tiny bit

* small updates

* fuck FUCK YOUR MERGE CONFLICT FUCK
2019-02-14 21:12:55 +11:00
oranges f3ae55258b Merge pull request #42758 from VileBeggar/scrunglartiy
Adds scrunglartiy as a roundend sound
2019-02-14 16:18:15 +13:00
oranges 7915f92860 Revert "Update glass.dm"
This reverts commit 601d0ead30.
2019-02-14 02:41:02 +00:00
oranges bbf29ec971 Revert "Update glass.dm"
This reverts commit 1edc2ac52d.
2019-02-14 02:40:55 +00:00
oranges 3c3d52b5fb Merge remote-tracking branch '5dplanner/5dplanner-patch-1' into upstreamunsafemaster 2019-02-14 02:40:08 +00:00
nervere 731efa5b66 Fix only mimes being able to scream (#42766) 2019-02-13 16:23:23 -08:00
5dplanner 1edc2ac52d Update glass.dm 2019-02-13 18:40:40 +00:00
ShizCalev 74e4f1d558 Fixes syndicate borg L6 icon (#42751) 2019-02-13 13:35:28 -05:00
5dplanner 601d0ead30 Update glass.dm 2019-02-13 18:29:06 +00:00
ShizCalev 9536991f2e Holograms can no longer become sentient animals (#42715) 2019-02-13 12:26:50 -05:00
granpawalton 24d5c9f1c3 Fix layer 3 injectors, replace a scrubber with pump on Syndicate Lavaland base (#42747) 2019-02-12 20:22:01 -08:00
Shadowflame909 92113f7e9c Makes the Meteor Shuttle way more expensive (#42730)
* Update shuttles.dm

* Update shuttles.dm
2019-02-12 23:20:06 -05:00
Kierany9 14fa6040e5 Assimilation 2.0: Not quite a big enough PR to be worthy of the 2.0 title but almost (#42607)
* one

* ???

* big

* sprites

* it is done

* oofs

* no more bad jokes

* location -> reception

* i forgot a feature lmao

* yo lemme nerf this op power

* adjust removal and makes panic less insane

* hey i forgot another feature

* one mind removals

* *laser eyes meme*

* Disables multiple one minds for real this time
2019-02-12 20:02:23 -05:00
Tlaltecuhtli d3d76eb3c7 light replacer tweaks (#42720) 2019-02-12 19:59:10 -05:00
imsxz d5abf90113 pacifist antags retain pacifism (#42674)
* pacifism forever

* oops

* plan z can't possibly fail
2019-02-12 19:55:24 -05:00
granpawalton 7ebd0ad09b tweaks tissue hydration to meet description and holy water added to desc (#42745) 2019-02-12 19:53:55 -05:00
Vile Beggar 29d5499f3e How do I set up the. SHow do I set u p the Singu. how I the scrungulartiy???? 2019-02-12 22:36:58 +01:00
subject217 ced93fb4cd Takes headslugs out of the gold extract spawn pool (#42731)
Why?
A couple of reasons. Primarily, it's pretty obvious how overpowered xenobio is these days. Secondly, this isn't really real content, it's just a juxtaposition of content that is normally for antags (changeling). Third, this specific "content" really only benefits the person doing it (the xenobiologist) and is usually just used to validhunt or to killbait.

Or to rephrase, xenolings are only really ever fun for the person doing it and it's either directly or indirectly less fun for everyone else involved. Since there is a real reason to nerf xenobio (it's quite overpowered) this is a pretty good target.

The way that I've gone about this in particular avoids nerfing any of the more interesting interactions in xenobio as well. Something like the mind swap potion, or just gold slime core reactions as they currently work, could have gone away entirely. But this is probably the lesser evil.
2019-02-13 10:24:09 +13:00
zxaber aba756ea58 Adds a max length config option for AI law upload boards. (#42700)
* Adds a length check for freeforms, 250 char cap

* added a define as requested.

* Actually it's better if it applies to all boards

* Now it's better good

Also added a max to the Asimov board that was missing it before.

* Better defined

* Undefining defines

* Config code

* Adding config line

* whoops

* Update AI_modules.dm
2019-02-12 15:18:17 -05:00
PKPenguin321 12f0ec568f [Ready] [Could Use Sprites] add Antenna and Mind Reader powers, paranoia disability to genetics (#42443)
* adds the antenna power to genetics
it gives you an innate radio

* adds paranoia and mind reader

* foil hat interaction, sprites, tweaks

* upstream change
never webedit, kids

* fixes conflict-fixing error
2019-02-12 13:21:07 -05:00
Nirnael 128c9fd5ad Fix modular processor runtime (#42736) 2019-02-11 15:03:50 -05:00
Whoneedspacee 6a70a982df [Ready] Megafauna VR Training Simulator (#42353)
* lava arena is now not the default for swoop attack

adds mass fire attack, sends fire lines out from the drake in 360 degrees

lava pools now have a chance to be spawned with the fire breath attack

adds greater delay for lava pools on lesser ash drake so they don't just all instantly get placed

lava arena doesn't needlessly recalculate the turfs it will be using every pass now

enraged state, procs when you try to escape from the lava arena attack without fighting it normally, colors the drake turns its brightness up as it glows, then shoots out fire everywhere, also heals the drake for 250 health.

fixes a bug where fire lines wouldn't appear if their range would put the calculated end turf outside the map

fixes a bug where indestructible open turfs would turn into basalt on the lava arena attack

fixes a bug where lava arena safe spots would be on indestructible closed turfs

drake swoops now have a greater default recovery time

* fixes stupid text error

* adds vr mining sleepers to the lavaland mining base which can be used to train with megafauna and test out other items

removes useless code from colossus's file including having a dead icon of the drake and butchering results

adds virtual versions of each megafauna which don't drop any items and are deleted upon death

adds the vr mining map

* adds virtual megafauna spawners and their respective icons, spawn 1 megafauna at their location and are indestructible

changes default virtual megafauna hunter gear to be more like the default mining gear

* adds more items to spawning in mining vr

megafauna spawner nests can no longer be pushed

virtual megafauna now have a limit to how far they can move away from their nest

adds arenas and fast bluespace tile paths to each megafauna spawner and gives the mining base some walls to protect it

* adds mining vr map to the away mission config

adds perm portals, linked two way portals who are linked by id and can be set in mapping files by editing instance

adds megafauna portals for the arenas

fixes up some junk on the mining vr map

adds a spawn delay for megafauna spawners after the linked megafaunas death

fixes a bug where bubblegum could teleport outside of his arena

* adds true spawn var to bubblegum to easily handle clones / virtual versions of it spawning

fixes bug where virtual legion would release the real legion when damaged

moves vr mining code to the away missions code to adhere to contributing.md

* converts map files to tgm

adds arena cleanup and fixes runtime bugs on virtual megafauna spawn and death

* reverts local drake changes

* fixes bug where drake corpses still had a gps signal

removes worthless include

* adds the crusher trophies to the vr mining kit

no more granting null achievements you stinky virtual megafauna

this map really didn't need to be 255x255 im sorry

* even smaller map wowee also please compile

* adds respawning item crates for the lavaland items and healing junk

even smaller map and some filler spaces for possible future bosses

removes lavaland map changes

mining vr now works properly with other vr maps and is randomly selected working with normal vr sleepers on station

fixes permanent being permanant my bad

* lavaland map stop being changed

* maybe a bit overkill with the amount of healing items

* reordering i guess but why is the rum gone

* work please

* Update Lavaland.dmm

* Update Lavaland.dmm

* adds force stop option to portals so you can choose to not chain teleports with non linked portals.dm

permanent portals now can be var edited mid game and still work (cool admin events? idk)

permanent portals are no longer deleted if they don't have a linked portal

adds one way portals, portals that lead somewhere but have no return portal. basically non hardlinked portals but able to be done in map and edit stuff

adds recall portals for the vr megafauna arenas, one way portals but you can recall to them by using a one time use spell (no it is not tied to your real mind it is tied to the vr mind)

virtual megafauna can no longer escape their arenas

moves some virtual megafauna procs to the main megafauna file to reduce needless code

* recall portals can now be chained and the portal recall spell can now go back in a stack reverse style

* adds boss rush mode, fight all of the bosses successively with only one break in the middle without dying

object spawners can now choose their datum spawner type through a var

moves some virtual megafauna code from the megafauna file to the megafauna spawner datum

* adds new goodies to the end of the boss rush

removes a lot of the copy pastad code in the vr megafauna

adds true spawn var, decides whether or not the megafauna should grant achievements or have an internal gps, used for bubblegum hallucinations and virtual megafauna

internal gps are now added on the base megafauna path

hierophant's crusher trophy no longer spawns at its beacon (let's be honest some people missed it because of this) so it works properly with the crusher loot var
2019-02-11 12:01:51 -05:00
IndieanaJones 0937264f1e [READY]New Side Antagonist: Space Dragon (#42551)
* Add files via upload

* Rename space_dragon.dm to code/modules/events/space_dragon.dm

* Adds Space Dragon

* Adds Space Dragon Event

* Remove Copied File

* Put antagonist definition in proper location for space dragon

* Update space_dragon.dm

* Removed passive health regen from space dragon

* Updated Weight and Earliness for Space Dragon

* Added Objective to Space Dragon, Updated Starting Blurb

* Cleaned Up the Objective Determiner

* Actually fix the space dragon objectives

* Fix the objective display for the space dragon's target

* Updated Space Dragon Intro Blurb

* Updated Centcom Message When Space Dragon Spawns

* Updated Space Dragon's description with new lore

* Clean Up Space Dragon's OnFire()

* Add Space Dragon Sprites

* Sprite in wrong location

* Properly adds Space Dragon Sprites

* Adds Space Dragon Tiny Sprite to be Carp

* Space Dragon Uses New Sprites, Tiny Form Updated

* Increased Time Til' Dragon Spawn

* Drake's Tail Sweep Now Uses Prebuilt Spell

Thanks to Cobblestone for the head's up on this.
2019-02-10 21:12:17 -05:00
Time-Green acfd3f8253 [GOONETICS] Chromosomes (#42151)
* adds chromosomes

* Makes the framework nice and functional

* Adds chromosome interaction

* Makes chromosomes work

* removes the double instability update

* Apply suggestions from code review

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

* more review stuff

also fixed some inconsistencies in chromosomes

* unfucks defines

* Fixes saved mutations runtiming with empty pods

* Adds stability to the dna console and advanced health scanner

* removes a random bug i stumbled upon

* Update code/game/machinery/computer/dna_console.dm

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

* makes chromosomes harder to get

fixes double mutations, adds reinforcer and nerfs stabilizer

* fixes edge case where fireballs would be harmless

* cleans up find/replace all mess and 1 in 10 trillion chance of fireball breaking
2019-02-10 20:45:09 -05:00
Caiggas 0979aa0cd3 Adds wooden chapel pews (#42712)
* Adds wooden chapel pews

This adds wooden chapel pews to the game. They function much like ratty couches, in that there are several different pieces which can be mixed and matched to make different length pews. They can be built from 3 wooden sheets.

The change to sheet_types.dm adds the pew crafting recipies to the end of the wood sheets crafting list.

The added file pew.dm  is the code which makes the pews work.

The added file pew.dmi is the sprites for the pews, including the overlays for the armrests.

the change to tgstation.dme is a single line which includes pew.dm.

This is my first PR ever, so please let me know if I made any mistakes in approved process.

* merged pew.dmi into sofa.dmi

As per the instructions of several commenters, I merged pew.dmi into sofa.dmi. pew.dm has been updated to reflect this.
2019-02-11 13:43:32 +13:00
nero1024 e949346cfd Fixes footstep sounds for downed/lying mobs (#42704)
Nobody made a report but I noticed this issue: Downed players being dragged are playing footstep sounds, specifically the bare footstep sounds via their hands from what I noticed.

Fixes (hopefully) footstep sounds from being played from incapacitated mobs that are being moved (via dragging for example). Instead, lying mobs will play a crawling sound when moving.
## Why It's Good For The Game

Footstep sounds shouldn't be played when mobs are being dragged.
2019-02-10 12:43:55 +13:00
oranges ed9a95c8f2 Merge pull request #42711 from ShizCalev/medboy-fix
Fixes medbots internal beakers not working
2019-02-10 12:42:38 +13:00
Rob Bailey a39b5d352f Yet more gun fixes (#42722)
Continues fixing the tide of broken shit with my awful PR.

This time around:
Corrects a control message for the l6 saw on examine
Reworks the way that open bolt guns work so that they actually work the way open bolt guns are supposed to. Loud bolt drop when you try to fire an empty magazine included.
Fixes bulldog magazine overlays.
Fixes an issue with tacloads not updating the removed magazine's icon state correctly.
Fixes locking bolt not locking back on the last bullet fired but instead on the
2019-02-10 08:02:33 +13:00
TerraGS c3fb41599e Adds toggleable light and blinking charging light to crusher (#42520)
* Adds toggleable light and blinking charging light to crusher

* no need for tool procs in this type path
2019-02-09 22:44:20 +11:00
Vile Beggar 313db3ad8b Tweaks the drill hat to be a bit less annoying (#42655)
* does the tweaking

* indent fix

* adds more canadian variety

* no longer mr politeman

* adds cobby's review suggestion

* gets rid of mutation defines

* makes it use speechmod

* removes accidental letters

* gets rid of unneeded comma in .json

* changes magic number into defines

i hope it's supposed to be like this

* compile fix

* gets rid of yelling define in dna.dm

* removes unneeded line in .json
2019-02-09 22:26:49 +11:00
Jordie 881a81fd83 Merge pull request #42702 from PKPenguin321/stolen-ling-fix
Fixes a runtime that gave lings an instant revive
2019-02-09 21:53:04 +11:00
YoYoBatty c33235f108 Fixes an undeleted sql query (#42703)
* Fixes an undeleted sql query

* ARE YOU SURE ABOUT THAT
2019-02-09 21:52:10 +11:00
Jordie 8193f239a4 Merge pull request #42705 from ShizCalev/tk-pda-fix
[s] Fixes PDA TK exploits
2019-02-09 21:48:19 +11:00
ShizCalev a0d6032457 In space nobody can hear you honk. (#42706)
* In space nobody can hear you honk.

* spess
2019-02-09 21:46:46 +11:00
Rob Bailey 8d817adb5e More General Gun Fixes (#42693)
Fixes some incorrect sprite paths, bad implementation, and logic inconsistencies that were resulting in missing sprites and fucked up sprites. Fixed some weirdness with the RPG due to wrong bolt type. Fixed bullet count being incorrect on anything with an internal magazine. Fixed issue with internal magazine tacloads that was resulting in them locking up and being unable to shoot.

Closes #42683
Closes #42672
2019-02-09 16:34:36 +13:00
Cruix b26dc2b508 Update layers.dm
Fixed overlapping plane defines
2019-02-08 19:05:50 -08:00
oranges a16da0665a Merge pull request #42708 from ShizCalev/sound-datum-output-fix
Fixes incorrect datum/outputs type check in playsounds
2019-02-09 14:30:54 +13:00
Vile Beggar 18802ff4e2 Tweaks lights to spark less (#42696)
* makes lights spark less

* applies cobby's suggestions from review

Co-Authored-By: VileBeggar <edmir995@gmail.com>
2019-02-08 16:32:38 -05:00
oranges a18385a039 Merge pull request #42698 from Ghommie/Ghommie_tg2
ISINRANGE_EX fix.
2019-02-09 09:26:16 +13:00
ShizCalev bada753a3d Fixes medbots internal beakers not working 2019-02-08 12:41:59 -05:00
tralezab 43ecae6fa2 sleeping carp now deflects projectiles in random directions (#42647)
* bad ass shit

* durr

* nice

Co-Authored-By: tralezab <40974010+tralezab@users.noreply.github.com>
2019-02-08 11:56:25 -05:00
subject217 7a2d4cd7ef Removes the stamina version of .45 ammo (#42692)
* webbit reddit

* commits for each file

damn i hate web edits

* magazine

one of these is going to conflict with the guns pr why am i doing this at 2 am

* yeet

* does it compile

probably not
2019-02-08 11:55:48 -05:00
tralezab 46e3894bb2 Creep fluff completely rewritten (#42675)
* hang in there!

* Apply suggestions from code review - rewrite P1

Co-Authored-By: tralezab <40974010+tralezab@users.noreply.github.com>

* most creep > obsessed - rewrite P2

* removes creep_inlove, last edit to greet
2019-02-08 11:26:41 -05:00
ShizCalev e64c1fddf1 Fixes incorrect datum/outputs type check in playsounds 2019-02-08 04:59:13 -05:00
ShizCalev 8f060bb5fb Fixes PDA TK exploits 2019-02-08 03:21:36 -05:00
PKPenguin321 45151e46eb fixes some shit with lings 2019-02-07 20:20:26 -08:00
PKPenguin321 cefe4a6a51 [Ready] Adds 5 new negative/minor negative mutations, mutation conflict system (#42524)
* adds 5 new (minor) negative mutations
also adds a mutation conflict system

* removes debug comments and to_chat(world)s

* addresses reviews

* further review addressing, new message
and a message given to the subject when a mutation fails to manifest because of conflicts

* cooldown on acid flesh message
2019-02-07 23:08:29 -05:00
Ghommie a6b4d8f62f < 2019-02-07 21:13:46 +01:00
gy1ta23 b547cc9bfb Fixes immersion ruining clothesmate line (#42684)
* Update clothesmate.dm

* Update code/modules/vending/clothesmate.dm

Co-Authored-By: gy1ta23 <44277885+gy1ta23@users.noreply.github.com>
2019-02-07 15:00:55 -05:00