Commit Graph

12225 Commits

Author SHA1 Message Date
nemvar 6df60268c2 Change cable related magic numbers to defines (#44828)
Replaced most instances where the maximum size of a cable coil was
referenced with the MAXCOIL.
2019-06-27 21:42:11 -07:00
nemvar b83eca4647 Fix sharpness-related issues (#44830)
Turned off energy weapons can no longer cut down trees, destroy wooden
walls, harvest lavaland plants and make planks.
2019-06-27 21:19:33 -07:00
oranges 62667d64d2 Elance no longer transcends space and time (#44849)
very cool, helen
2019-06-27 14:57:44 +02:00
kingofkosmos c969f6d3eb Merge branch 'master' into addswarningspans 2019-06-27 15:12:54 +03:00
oranges 2bb0e101e4 Merge pull request #44756 from Mickyan/dishdrive_stuff
The dish drive is a neat little machine but it has a few quirks that makes it a bit of a pain to use, so that's what I'm looking to fix.

Dish drive will still collect but no longer throw away your still perfectly usable dinnerware. Glasses are not disposable, despite what your average bar patron would like you to believe.

The bardrobe now sells a premium box with all the parts you need to build the dish drive (the board alone can still be found in the free category). Saves you the trouble of running around the station looking for parts instead of serving your patrons, but it's quite expensive. Make sure to tip your bartender.
cl
add: DIY Dish Drive Kit now available at your local bardrobe. Start saving those tips!
tweak: The Dish Drive no longer sends reusable items into the disposal bin
/cl
2019-06-27 20:32:17 +12:00
zxaber f01e2704e1 [READY] Ammunition management for ballistic mech weapons, and a nerf to mech missiles (#44529)
About The Pull Request

Adds an ammo system and printable ammunition to most mech weapons with a "rearm" function. Replaces the old system of generating ammo at a power cost. With the exception of the missile launcher and clusterbang launcher, all affected weapons have a storage capacity of ammunition equal to four-times the amount of ammo that the weapon can load (though the storage cache starts with only one full reload when printed from the mechfab). Ammo boxes are printed from the mechfab and also are available in the Sec protolathe, and each box will carry exactly one full reload. Ammo boxes are not terribly expensive, but reloading requires either an ally on foot to pop the ammo box in, or for you to hop out and do it yourself.

Missile tubes and the clusterbang launcher do not have an ammo storage cache, and so reloading them will reload the tubes directly. This is not the full extent of nerfs that the missiles need (I will do those in a separate PR since I suspect this one will be controversial) (read below), but removing the ability to reload missile pods without an ally or exiting the mech may help a bit.

The SRM-8 has been replaced with the new BRM-6 in tech webs. The BRM carries a smaller explosion and does not explode unless hitting a wall, door, shutter, or another mech, and only has six shots. The SRM-8 remains on the Mauler mech. If the BRM missile does not explode, it will deal 30 brute damage instead, and break.
Why It's Good For The Game

Currently, mech ballistic weapons function like reloadable lasers. You have an ammo counter, but it's one hundred percent based on your energy cell. This gives some flavor to ballistic weapons, making them actually feel different, and gives them a mini-niche in the form of good choices to use alongside an energy-draining mech ability (like the Gygax speed).

Use lasers when you won't need to worry about power and/or need burn damage.
Use ballistics when you want to save power and/or need brute damage.

The SRM-8 to BRM-6 change is being done here so that I don't have to wait until this PR is merged before starting it. The idea is to keep the reasons why you'd want to build a missile launcher (wall breaking and mech fighting) without also outclassing most other weapons burst damage potential. I'm not truly happy that the explosions deal zero damage to surrounding people even one tile away, but dealing no damage is better than the massive damage + stun that the current missile launcher does. Nuke Mauler has the old launcher, since I believe the consensus is that Nukie Mechs are already not generally worth the money.
Changelog

cl
balance: Mecha ballistics weapons now require ammo created from an Exosuit Fabricator or the Security Protolathe, though they will start with a full magazine and in most cases enough for one full reload. Reloading these weapons no longer chunks your power cell. Clown (and mime) mecha equipment have not changed.
balance: The SRM-8 Missile Launcher has been replaced with the BRM-6 Breaching Missile Launcher in techwebs (Nukie Mauler remains equipped with the SRM-8).
balance: Both Missile Launchers and the Clusterbang Launcher do not have an ammo cache, and cannot be reloaded by the pilot. Once the initial loaded ammo has been spent, you can use the appropriate ammo box to load the weapon directly.
add: Utility mechs that have a clamp equipped can load ammo from their own cargo hold into other mechs.
add: Nuke Ops can purchase spare ammo duffel bags for their mecha weapons, should they run low.
/cl

To-Do:

Add ammo to security protolathe
Get better ammo box sprites (hopefully)
Possibly adjust ammo counts for balance. Might make the flashbang launcher and/or cluster launcher behave like the missile pod.

    Add functionality for the utility mechs to use clamps to load ammo from their cargo hold into another mech.

Ammo counts, for anyone wondering:
Weapon 	Magazine Size 	Total ammo at start* 	Maximum total ammo*
Scattershot† 	40 (10) 	80 (20) 	200 (50)
Hades 	24 	48 	120
Ultra AC 2† 	300 (100) 	600 (200) 	1500 (500)
BRM-6 Missile Rack 	6 	6 	6
SRM-8 Missile Rack 	8 	8 	8
Flashbang Launcher 	6 	12 	30
Cluster Launcher 	3 	3 	3

*Total ammo is the amount in the weapon's magazine plus the stored ammo.
†The Scattershot lists its ammo as 40, but uses four per shot. So in reality, a single full reload gives you ten shots. Similarly, the UAC2 fires in three-round bursts, and so 300 rounds is 100 bursts.

Clown weapons (and the mime weapon) are all unaffected by this change.
2019-06-27 20:03:31 +12:00
ShizCalev 3633e849aa Fix defib paddles burning desync (#44827) 2019-06-27 00:48:12 -07:00
kingofkosmos ec5c82029a * "Is already...", "Can not...", "Not when..." etc. 2019-06-27 06:15:43 +03:00
Rob Bailey 532cc7ea63 Smart cable fixes (#44784)
I wanted to get this up next day but I kept falling asleep before finishing what I wanted to
About The Pull Request

Fixes some issues that have been brought to my attention with smart cables

Closes #44768
Closes #44775
Why It's Good For The Game

this shit pretty broke as is in game.
Changelog

cl
fix: removed mech rcl from the research node so it stops spamming a warning in log
fix: cables now disconnect machines when cut
fix: terminal linking/not linking behavior with smeses has been improved
fix: couple of small mapping fixes
tweak: changed cable coils back to 30
tweak: changed the box smes room a little to prevent stacking terminals
tweak: removed the rpcl from engineering on every map because it's not used for wiring anymore
/cl
2019-06-27 12:20:49 +12:00
kingofkosmos d7dd679b5a Fix span endings (#44812)
Adds a slash to instances of <span>" --> </span>".
2019-06-26 15:11:03 -07:00
vuonojenmustaturska 867aca7abf Grants the common man access to some parts of the lavaland mining base (#44769)
* will this work?

* add shuttle console to meta

* add shuttle console to box

* remove glide size from box, add shuttle console to delta

* replace airlocks in lavaland common area

* remove step

* secure the gulag a bit more, add a beer fridge

* restore unix line endings?

* Update code/game/objects/structures/crates_lockers/closets/secure/freezer.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* review
2019-06-26 14:52:19 -04:00
py01 29f419c855 The guillotine can be repaired with plasteel (#44719)
The guillotine is a funny item, but you can only repair it with a
whetstone (used or unused). Since the whetstone is rare this leads to
odd situations where the easiest way to sharpen your guillotine is to
make a second one. This lets you repair the guillotine with plasteel,
each piece restores 30% durability (it costs 3 plasteel to make) and
takes 10 seconds.
2019-06-26 02:19:40 -07:00
Tad Hardesty ba95173289 Fix keyword argument warnings 2019-06-26 01:59:57 -07:00
kingofkosmos ebf787a97a * "You should..." and "You must..." 2019-06-26 06:13:32 +03:00
kingofkosmos 81a0518474 * warning-spans added to cases of "You do not..." and "You don't..." 2019-06-25 22:05:55 +03:00
kingofkosmos 6bbb64e2cf * more warnings 2019-06-25 21:46:21 +03:00
kingofkosmos fb9731492c * extra spaces removed from "span class = '" --> "span class='"
* warning-spans added to cases of "You need..."
2019-06-25 21:03:25 +03:00
nemvar 8d5807d610 Fixes the stupid beesword thing (#44740)
* Fixes the beesword

* stupidpronoun
2019-06-25 15:32:04 +02:00
Arkatos1 6c867b6936 Carp Expansion Pack [greyscaled] (#44720)
About The Pull Request

This PR ports Baystation color carps. In short, normal carps can now spawn in variety of colors, 

This only affects normal carps, not special ones like magicarps or megacarps, these retain their own unique sprite. There are also some pretty rare color variant for carps and our friendly Syndicate carp Cayenne has increased chance to get it.
Why It's Good For The Game

Better aesthetics and immersion.
Changelog
cl
imageadd: Normal carps now spawn with a random color! There might even be some really rare color variant.. try asking Cayenne about it.
/cl
2019-06-25 11:28:05 +12:00
kingofkosmos df1aa091b2 * adds warning-spans to various messages 2019-06-24 21:05:22 +03:00
nemvar 04c4940e07 Make a crapload of new cardboard boxes craftable (#44744)
It's a bit more flavourful. Gives cardboard more stuff to do.
2019-06-23 21:58:38 -07:00
Coconutwarrior97 134d93cb09 Add logging for pyroclastic slimes (#44735)
Makes it easier for admins to investigate whether a slime killing
people is a pyroclastic slime or not.
2019-06-23 21:55:18 -07:00
Garen Crownguard 3a37d0322c merge 2019-06-23 20:39:24 -05:00
XDTM 86f184a802 Quantum teleportation makes rainbow sparks (#44664)
About The Pull Request

Happy pride month

Jokes aside, since its addition quantum teleportation has always had a rapidly-changing-rainbow motif, i thought that making the sparks behave in the same way would be cool now that we have teleport flags.
Side change: non-bluespace teleportation no longer makes sparks by default.
Changelog

cl
tweak: Quantum teleportation now makes pretty rainbow sparks instead of the normal ones.
fix: Non-bluespace teleportation (spells etc.) no longer makes sparks.
/cl
2019-06-24 10:50:33 +12:00
bgobandit 87006c3c6d Gives the mime two new spells: Invisible Chair and Invisible Box. [READY] (#44494)
About The Pull Request

    Adds two new mime spells to the game. Both work like the invisible wall, i.e. they spawn an invisible item for a limited amount of time:
    Invisible Chair: Summons a chair and has the mime sit in it. Perfect for crowded shuttles or staying put.
    Invisible Box: Everyone's favorite stock mime routine! The mime summons a box (invisible to everyone but him, although you do get the message once spawned) that can store small items. When it disappears, the items are dropped.
    To prevent massively overpowered mimes, the mime gets a spellbook at roundstart from which he can choose only one out of the three mime spells.

Why It's Good For The Game

The mime doesn't get nearly as much cool stuff as the clown, and these are pretty common pantomime routines to riff off.
Changelog

cl
add: After receiving many complaints about mimes who never pantomime, Nanotrasen has liquidated its mime personnel and hired new mimes who know more routines.
add: The mime gets the choice of two new spells: Invisible Chair and Invisible Box. They work much like the Invisible Wall spell does and disappear after a short span of time. The invisible chair can be buckled to like usual chairs; the box works like a standard inventory box item.
tweak: Mime spells are now granted via a spellbook that starts out in the mime's inventory. Mimes can choose one of these three.
/cl
2019-06-23 13:24:00 +12:00
Mickyan b6782cea8c dish drive 2019-06-23 03:03:49 +02:00
Akrilla eba239656f Contract QoL and fixes (#44705)
* QoL and location bugfix

* QoL and bugfixes

* Further fixes

* Name fix

* Text changes

* revert delay

* Same fix for returning

* description update

* New TC generation

* Slight delay for ransom cut, so they can hear the beep

* Give a written guide

* Third item

Alright I'm sold, let's try it

* Forgot to add text changes in line with the new item

* Merge conflict

* In datum
2019-06-22 19:13:06 +02:00
Dennok a79be996d9 Cable Layer signal getMobhook fix (#44715) 2019-06-22 13:23:08 +02:00
AnturK dd93afec90 Fixes harmonica warning. (#44701)
* Fixes harmonica warning.

* Yep
2019-06-22 01:43:47 -04:00
Rob Bailey 65e9888fa6 [READY] Smart Cables (#44265)
Cables now autoconnect on cardinal directions. All cable placement has been completely stripped out and replaced with simple single cable per tile logic.
Low effort demo: https://www.youtube.com/watch?v=fXp8s6ORWbA
Yes I am aware that cutting it is not dropping wire, that version was bugged.
Cables no longer need a knot specifically placed to link to power objects. The sprite is automatically changed to represent this.
The only exception to this logic is that on smes units, due to the terminal being next to the output, they will not link there.
On a technical powernet side, this is the same as old cables once actually placed. They still use the existing powernet system, just the placement and connection works differently.

Old cables have been turned into "pipe cleaners" for wire art purposes. they work just like the old ones, just missing all the powernet functionality, and also you can put them on top of the floor.
Why It's Good For The Game

How obnoxious cables were to both map and work with in game has been something that has annoyed me for a really long time now.
This is both easier for new players to learn, and easier for experienced players to work with.
Along with making in game much more intuitive and easier, it makes mapping much easier as well. Mad lad wjohn was able to rip out all the mapping conversion in one day because of how much faster it is to work with.

cl actioninja and wjohn
add: Cables have been completely reworked. Simple per tile connection logic, automatically connects to things above it. Think minecraft redstone.
add: Old cables have been kept as pipe cleaner. They are non-functional in terms of power, but otherwise have the same connection logic. Also can go on top of tiles.
remove: mech cable layer has been removed because it was terrible shitcode nobody used
tweak: (sort of balance) cable stack sized has been reduced to 15.
/cl
2019-06-22 10:24:37 +12:00
Tlaltecuhtli b642ed67a7 the stinger (#44515)
buzzes profusely at the really bad commit names
2019-06-20 20:58:13 -04:00
Shaps 8954265573 Agender fixes (#44597)
Credits to Europaisch for help finding all the records stuff

Fixes a few issues I was not aware of with my initial PR

* Being agender is now a distinct DNA value (fixes agender spessmen
  turning female when having their DNA referenced, like during cloning
  and some rudimentary transformations)
* Neatens up preference code, more in line with previous code, fixes
  an issue with male underwear not surviving preference loading and
  defaulting to female underwear
* Allows agender spessmen to change their facial hair with mirrors
* Change medical, personnel, and security records from sex to gender
  and add "Other" option (they currently display "plural" even for
  agendered species like ethereals)
* The -san honorific now applies to plural gender instead of just
  neuter with the Chinese Cartoons admin secret (highly important)

I have never really played genetics and only tested the DNA code with
cloning and rudimentary transformations while still in a body (which
causes it to reference the old body's DNA, like with cloning). Please
let me know if there's a better way to do this and/or if this is apt
to create issues.
2019-06-19 13:59:39 -07:00
vuonojenmustaturska 8ddc9677c7 examine-code refactor (#44636)
* 1/4 done? maybe?

* more

* stuff

* incremental stuff

* stuff

* stuff & things

* mostly done but not yet

* stuffing

* stuffing 2: electric boogaloo

* Git Commit and the Kingdom of the Crystal Skull

* make it actually compile

* found more stuff

* fixes

* fix AI laws appearing out of order

* fix windows

* should be the remaining stuff

* this time for real

* i guess it should compile too

* fix sechuds
2019-06-19 22:07:57 +02:00
oranges dbf8658540 Merge pull request #44629 from vuonojenmustaturska/defines
Resolve overlapping defines by adding more specificity
2019-06-19 22:56:05 +12:00
nemvar 6eaf40adb1 Makes the hermit more based. (#44564)
* welp

* h

* Let's hope I didn't mess map diff up.

* prisoner unbased
2019-06-18 23:24:09 -04:00
wesoda25 67c2434a21 Adds lots of New Items to Syndicate Kits (#44509)
* Update uplink_kits.dm

* fucking stupid man

* Update energy.dm

* Update uplink_kits.dm

* Update special.dm

* Update special.dm

* Update misc.dm

* Update special.dm

* Update misc.dm

* makes hacker better
2019-06-18 23:22:57 -04:00
FrankFo 645156ff60 De-linkifies names in deadchat_broadcast(), makes deadsay css class default (#44600)
* De-linkifies names in deadchat_broadcast(), makes deadsay css class default too

* Makes the source argument come after message, since it is optional

* Removes excess </span>
2019-06-18 22:49:02 +02:00
vuonojenmustaturska ef414ee4d7 [READY] Replaces mining points with money, adjusts gulag payout (#44507)
* woop

* adjust miner regular payout

* golem, orm upgrade changes

* liberator

* tgui.js
2019-06-18 10:17:34 -04:00
vuonojenmustaturska 58935e41c9 Fixes and speedups to spraycans/crayons (#44561)
* spraycan stuff

* tgui.js again

* Update text.dm
2019-06-18 15:25:49 +02:00
nemvar 137e2af8e2 Turns art into a component (#44525)
* welp

* h

* artcomponent

* I forgot something

* handsome squidward

* handsome squid

* n

* Ghosts should have fun too, I guess.
2019-06-18 14:23:42 +02:00
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