Commit Graph

11595 Commits

Author SHA1 Message Date
Mickyan
d1b10b2691 Vendor tweaks & prices: take 2 (#40927)
* vendor tweaks

* i was never good at cooking

* soda

* boozeomat sorting

* updated ramen desc
2018-10-22 08:40:24 +13:00
MrDoomBringer
703a365aec Various code improvements (#40932)
* adsf

* asdf

* take these

* Further cleanup to windoor code
2018-10-21 03:01:02 -04:00
Jordan Brown
0d8c17d199 Merge pull request #41027 from AutomaticFrenzy/patch/cremate
Improve performance of creamatorium
2018-10-21 02:55:01 -04:00
Tlaltecuhtli
7cfba12b0f Fix instrument beacon (#40820) 2018-10-20 15:09:02 -07:00
ShizCalev
ca57ca7bee Fix being unable to stuff money into IDs (#41006) 2018-10-19 22:17:28 -07:00
ShizCalev
e5b84a3baa Tidies up ID examine messages a bit (#41008)
Getting a wall of grey text wasn't pretty, so I made it a bit prettier.

Also added some missing checks after inputs.
2018-10-19 22:17:02 -07:00
Tad Hardesty
2996b388f0 Improve performance of creamatorium 2018-10-19 21:09:20 -07:00
Jordan Brown
a2b6781b2a Merge pull request #41002 from AnturK/mindlesscode
Fixes c4 suicide shout
2018-10-19 09:34:36 -04:00
FantasticFwoosh
05fed1f0c9 changes amount of floortile per mat (#40990)
previously made 2 a piece respective of lavaland tile placing rules that aren't relevant anymore.
2018-10-18 14:01:23 -04:00
AnturK
8afa91da10 Fixes c4 suicide shout 2018-10-18 10:00:40 +02:00
ShizCalev
fe32324628 Updates mineral doors a bit (#40980)
* Updates mineral doors a bit

* obj oriented
2018-10-17 22:34:44 -04:00
Jordan Brown
bb6da6f001 Merge pull request #40953 from ShizCalev/mannitol-ghetto-surgery
Ghetto surgery can now damage brains. Mannitol can heal damaged brains.
2018-10-17 16:21:43 -04:00
MrDoomBringer
4c45832fe2 bards now recieve their instruments via orbital drop pod (#40833)
requires #40820

cmon having instruments just magic into your hands is lame. supplypods are fuckin lit.

cl MrDoomBringer
tweak: Instruments received from the express delivery beacon are now delivered via orbital drop pod.
/cl
2018-10-17 23:47:44 +13:00
ShizCalev
327a3d9927 Fixes sechuds not updating when inserting & removing an ID into/from a PDA/wallet/computer (#40826)
cl ShizCalev
fix: Fixed sechuds not updating when a user removes/inserts an ID from/into their PDA/wallet/computer while it's in their ID slot.
/cl
2018-10-17 23:45:35 +13:00
ShizCalev
f30dde0691 Adds examine messages to fire/lava/freeze/acid proofed clothing items. (#40800)
cl ShizCalev
tweak: Clothing (bags, gloves, belts, uniforms, armor, ect) will now inform you if they are resistant to frost, fire, acid, and lava when examined.
/cl
2018-10-17 23:44:19 +13:00
bgobandit
a939173d57 this kills tactical carp fucking (#40770)
Fixes #39371.

I left the stuffing thing alone because it is both funny and not a TC exploit
2018-10-17 23:23:54 +13:00
ShizCalev
9dbc86d7c5 Ghetto surgery can now damage brains, which then can be healed by mannitol 2018-10-16 18:52:55 -04:00
Jordan Brown
f64c009561 Merge pull request #40939 from swindly/chair_rods
Makes smashed chairs drop rods
2018-10-16 10:32:57 -04:00
Tlaltecuhtli
e00677ded0 borg upgrades tweak (spilt up of 40337) (#40479)
cl
tweak: borg upgrades price changes
tweak: mediborg chemical upgrades have been unified
/cl
changes:
borg rename: 35k metal -> 5k metal : fluff module
restart module: 60k metal ->20k metal : people just reconstruct the borg for free instead of resetting
vtec: 80k metal 6k glass 5k uranium -> 35k metal 12k 10k uranium: costs more uranium than metal 80k is like a whole fucking borg
disabler: 80k metal 500 diamond -> 20k metal 2k diamond : costs more diamonds instead of a whole borg of metal
soh: 250 gold 500 uranium -> 2k gold 1k uranium : those costs were not coherent with the rest
piercing syringe: 10k titanium 5k diamond -> 5k titanium 3k diamond : was really expensive for something thats pretty much useless unless you are traitor
defib: 15k metal 15k glass 10k silver 10k gold 5k titanium 5k diamond -> 8k metal 5k glass 4k silver 3k gold : that cost was shit for something you need to have if you dont want to be drags-the-bodies-to-cloning the lizard borg, also it reflects more the price of printing a defib
surgical processor : halfed prices, its a meh module just there for asimov abuse
trash bag : 10k metal 1.5k gold 250 uranum 1.5k plasma -> 2k gold 1k uranium: this pricing was pretty much random numbers put togheter, now its similar to the cost of a normal trashbag
mop: 10k metal 200 glass (????) 1k titanium -> 2k metal 2k glass : why the fuck does a mop cost titanium? now its similar to the cost of a normal mop
2018-10-16 18:38:37 +13:00
FantasticFwoosh
9a9a9f4506 Historic Heroes Unite!: Adds the historic beacon curator sets. (#40845)
* Adds the hero beacon

A Curator item with three preset uniforms availible to choose from.

* Changes curadrobe inventory content

Adds 'library supplies' of glasses & pens & removes the explorer gear.

* Replaces the curator's whip with a beacon

Its within the hero pack now.

* Creates the curators claymore

A ceremonial scottish sword for a hero pack.

* Pushes a line back into place

He who commiteth PR without fault, cast the first stone.

* Adjusts to one hero per beacon

Too many heroes may upset the time continuum.

* resolves merge conflict

I am thoroughly anti skub after this, conflict resolution for #40845

* Adds periods.

No timetravel pun intended, bad grammar is a crime. Period.

* Corrects advert typo

* Relocates skub

Pushes down the list to be with its relevant code split apart by the hero beacon rather than disjointed.

* cleans up code & spacing

Removes redundant code & spacing

* Cuts away more redundant code

Adds args to canUseTopic & removed !in_range
2018-10-15 21:39:48 -04:00
ShizCalev
f7fcc4e929 Removes tactical suicide borging (#40754)
* Removes tactical suicide borging

* correction
2018-10-15 22:51:22 +03:00
Emmett Gaines
5f08aa7cca Removes the redirect component usage from a few things (#40847) 2018-10-15 22:48:55 +03:00
CRTXBacon
241b998491 Adds the intelliLantern, another skin for the intelliCard (#40903)
* Update aicard.dm

* Update death.dm

* Update recipes.dm

* Add files via upload
2018-10-15 15:47:40 -04:00
swindly
ebc4fb08f4 Fixes urinal cakes being inedible (#40915)
* adds urinal cake to snacks

* adds types or whatever to urinal cake

* initializes urinals
2018-10-15 09:12:13 -04:00
MetroidLover
3af44d3d4c Makes Chaplain armour more inline with Chaplain theme (#40901)
Changes what the armour can hold from riot gear stuff to the chaplain's equipment previously listed in the whitch hunter garb
2018-10-14 15:16:09 -04:00
Barhandar
5b4d7c4291 Makes anchored=FALSE spawners have move_resist so they ACTUALLY CAN BE MOVED (#40905)
fix your shit kevinz; for now this SHOULD do
2018-10-14 15:09:51 -04:00
nicbn
10278bebde New sprites for gases (#40873)
* take one

* take 2

* oops

* take n

* n2o thing

* Update LINDA_turf_tile.dm

* Update atmospherics.dm
2018-10-14 16:43:08 +03:00
swindly
45e67977d7 makes chairs drop rods 2018-10-13 20:49:47 -04:00
swindly
013f438c38 Remove unused cold igniter proc (#40886)
Removes the orphaned proc of cold igniters, which were intended to be part of
freezethrowers but never actually got added to the game.
2018-10-12 13:19:51 -07:00
BeeSting12
e51d8d173c Makes the prices more reasonable. (#40532)
* flashlight

* YouTool check

* bar vendor

* shadycigs and kitchen

* engivend

* subject217s autodrobe stuff

* vendomat and botany

* merge conflict

* megaseed vendor

* emergency nanomed is down to 25

* medical vendor
2018-10-12 15:04:03 +02:00
MMMiracles
b14f3827e5 Suplex The Rod (#40774)
* rod suplex

* flux spawn + medal setup

* deals with rod-form wizards

* webedit lol
2018-10-12 04:48:23 -04:00
Jordan Brown
5dc4a3be76 Merge pull request #40803 from ShizCalev/ert-fireproof
Makes ERT backpacks and spacesuits fireproof
2018-10-10 18:36:59 -04:00
kevinz000
3e7184c975 Combat/Stun (slip) overhaul staging, mobility flags, adds crawling (#39967)
Aiming to implement the framework oranges has detailed in https://tgstation13.org/phpBB/viewtopic.php?f=10&t=19102
Moves canmove to a bitflag in a new variable called mobility_flags, that will allow finer grain control of what someone can do codewise, for example, letting them move but not stand up, or stand up but not move.

Adds Immobilize()d status effect that freezes movement but does not prevent anything else.
Adds Paralyze()d which is oldstun "You can't do anything at all and knock down).
Stun() will now prevent any item/UI usage and movement (which is similar to before).
Knockdown() will now only knockdown without preventing item usage/movement.
People knocked down will be able to crawl at softcrit-speeds
Refactors some /mob variables and procs to /mob/living.
update_canmove() refactored to update_mobility() and will handle mobility_flags instead of the removed canmove

cl
rscadd: Crawling is now possible if you are down but not stunned. Obviously, you will be slower.
/cl
Refactors are done. I'd rather get this merged faster than try to fine tune stuff like slips. The most obvious gameplay effect this pr has will be crawling, and I believe I made tiny tweaks but I can't find it Anything I missed or weird behavior should be reported.
2018-10-11 11:22:21 +13:00
ShizCalev
ff10ca1dbf Remove invalid bible inhands (#40824) 2018-10-10 13:14:34 -07:00
ShizCalev
ddacf23cf1 Fixes industrial satchel & dufflebag not having fireproof flag. (#40798) 2018-10-10 13:10:30 +03:00
ShizCalev
ad999af454 Prefixes the talking sword's spirt's name with "The spirit of" (#40801) 2018-10-10 05:49:53 -04:00
ShizCalev
af1859f5fc Makes syndicate belts and backpacks fireproof (#40804) 2018-10-10 05:47:48 -04:00
ShizCalev
1175a83e88 Correct blue space to bluespace (#40746) 2018-10-09 11:31:15 -07:00
swindly
b771478f06 Add glowstick suicide (#40787) 2018-10-09 11:04:41 -07:00
Jordan Brown
9b8afba6c4 Merge pull request #40779 from ShizCalev/id-fix
Fixes PDAs not unlocking lockers.
2018-10-09 12:46:39 -04:00
ShizCalev
dbc353454a Fixes PDAs not unlocking lockers. 2018-10-09 00:56:34 -04:00
ShizCalev
6444a4e6c4 Fix AI core dropping wrong circuit on decon (#40742)
Also cleaned up a couple vars and added qdel handling.
2018-10-08 21:54:38 -07:00
ShizCalev
55a88a7cb2 Makes ERT uniforms fireproof 2018-10-08 23:42:45 -04:00
ShizCalev
c8ca0c5d74 Fix canequip() bad arg runtime (#40767)
keyed arg 4noraisin
2018-10-08 18:32:29 -07:00
MrDoomBringer
2da05a2c74 Buffs agent ID cards by giving them a line of examine text (#40757)
* feedback

* asdf

* oh i see
2018-10-08 10:47:15 -04:00
ShizCalev
2a933c34d1 Adds a space in occupied intellicard names (#40728) 2018-10-08 10:34:47 +02:00
YPOQ
5b239f901e Fixes badass syndrones not recieving their weapon_auth implant (#40744) 2018-10-07 06:54:19 -04:00
Suicidalpickles
e4e1699c56 Adds Skub Suicide (#40736)
* Adds Skub Suicide

title
another dumb meme suicide

* Update miscellaneous.dm

* Update miscellaneous.dm
2018-10-07 06:50:28 -04:00
Tlaltecuhtli
848261b285 if you have musician trait you can now choose which instrument you get (#40588) 2018-10-07 06:44:19 -04:00
81Denton
f3bc3ce1da Adds more family heirlooms (#40717)
* Adds more family heirlooms

yeap... quake was a good game

* Moths always have lanterns or flashlights as heirlooms

* Lanterns

* Gives moth heirloom lantern reduced light range

* More engineering, CE, botanist, QM/cargo tech items
2018-10-07 06:42:27 -04:00