Commit Graph

221 Commits

Author SHA1 Message Date
RaveRadbury
84a0a262ec [READY] Adds follower hoodies to crafting menu (#43810)
* Follower hoodies can be crafted by those wearing follower hoodies

* Adds bible tool requirement to follower hoodie construction
2019-05-11 18:19:47 +02:00
AnturK
1dbcaf78a1 Adds simple framework for learnable crafting recipes (#43296)
* Adds simple framework for learnable crafting recipes

* whoops

* Moves teach/check functions to mind

* Code golf

* I just moved these around but fine.

Co-Authored-By: AnturK <AnturK@users.noreply.github.com>
2019-03-29 11:55:29 -04:00
ShizCalev
781c01e8b5 Correct ED-209 tablecrafting recipe (#43163)
ED-209 tablecrafting recipe has been corrected to use a DRAGNet.
2019-03-21 20:40:57 -07:00
Rob Bailey
ee33e9c6a8 [READY] The war on stun based combat, Phase I: Fuck ranged stuns (#42930)
Nukes the hybrid taser from orbit. Everywhere that spawned it now provides a disabler instead. Standard sec issue? Disabler. Armory? Disabler rack.
Want something with more punch? Beg the warden for a shotgun or an energy gun.
The hybrid taser itself has not been removed from the codebase.
Also removes the stun from the advanced energy gun so it doesn't just become the late game secret powerhouse.
Hoslaser keeps it, but only gets three shots instead of five.
The ebow has been COMPLETELY RUINED as well. See the changelog for details I'm too lazy to copypaste.
Why It's Good For The Game

Fuck stun based combat.
Sec still have their stunbatons, collapsible batons still exist, pepperspray still exists, flashbangs still exist. but now any fight involving sec or anyone who has robusted a sec officer will be less ranged instastun bullshittery.
Changelog

cl
balance: New NT regulations have replaced the standard issue hybrid taser with a pure disabler.
balance: Also fuck the stun mode on the advanced energy gun who thought that was a good idea.
balance: The hos's laser can only fire three taser shots instead of five.
balance: Energy crossbows have been reworked. They no longer paralyze, but instead heavily blur vision, apply a huge burst of stamina damage, and knock you on your ass for one second. Two shots is enough to down someone from stamina crit on both the mini and large versions. The blur lasts for 10 seconds.
balance: The price of the mini ebow has been reduced to 10TC to compensate for this weaker effect.
tweak: The ED-209 is now built with a DRAGnet and fires netshot instead of taser bolts.
balance: Stunshells can no longer be produced in any lathe.
balance: The "pacifier" mech taser can no longer be built.
/cl
2019-03-08 10:30:50 +13:00
TerraGS
9ccdcd0c11 Adds floorbot variations 2019-02-27 01:33:56 -06:00
Strommer Kilian
34cebb22e0 Adds firebots to the robotics arsenal (#42881)
* initial firebot commit

* add sprites for the firebot

* firebot.dm: More work on the firebot, implemented emag behaviour and better extinguishing
construction.dm: Added firebot assembly

* extinguisher.dm: Added support for the firebot assembly

* fix build error

* commit missing dme

* now drops the helmet again, also added a message for knocking people over

* fix previous commit, thats what you get for pushing without building first

* firebot now deploys firefighting foam when under heat instead of spraying wildly

* fix typos, move defines to top of file and adds undefines to the end

* renamed loc to drop_location for clarity

* fix drop location for real this time

* extinguisher.dm: Add newline to eof
firebot.dm: Make explode() use drop_location properly (for real this time), text fixes, removed improper use of .loc

* Update code/modules/mob/living/simple_animal/bot/firebot.dm

Co-Authored-By: Lett1 <kilian2311@gmail.com>

* update emag behaviour to use cfl3

* recipes.dm: Add crafting recipe for firebot
extinguisher.dm + construction.dm: Move extinguisher on_attack code to construction.dm
2019-02-26 21:01:42 +11:00
Tlaltecuhtli
9c15f1173e The pneumatic cannon now takes 50 instead of 300 ticks to craft (#42803) 2019-02-21 11:19:18 -05:00
daklaj
f8a58933e1 Makes riot shields ignore beam projectiles and eventually get destroyed after absorbing too much damage (#42721)
* Riot shield tweaks

* Strobe shields + repairs

* f
2019-02-19 11:17:26 -05:00
Rob Bailey
69e217d8d9 [READY] I got guns (#41804)
cl actioninja\memager
refactor: Ballistic guns have been almost entirely reworked from a backend side. This primarily focused on moving as much as possible into the base ballistic gun and turning as many other guns into essentially varedits as possible.
add: Guns can now be racked. This is the default action unless the magazine is empty.
add: Guns now can have the magazine removed by clicking on them with an open hand while they are in hand.
tweak: Suppressors are now removed by alt clicking instead of clicking with an open hand
add: Guns now have various bolt types that all function a bit differently. Open bolts cannot have a bullet chambered with no mag, locking bolts lock back after running out of ammo, etc.
add: All ballistic gun sounds are controlled by variables instead of hardcoded usages.
tweak: The l6 LMG has a reworked control scheme. alt + click to open and close the cover, open hand to remove mag, place mag in by slapping them together, default action is rack.
tweak: Functionality that used to be snowflake code such as tactical reloads has been moved to the base gun, and can be toggled by variables.
refactor: All shotguns are now properly subpaths of the shotgun type. They still work the same.
imagedel: Gun sprites have been almost entirely overhauled to use overlays instead of states. This collapsed the L6 sprite from 20 sprites to 9 sprites to give an example.
soundadd: Remixed versions of the shotgun and base gun firesound
soundadd: New rifle firesound for l6 and moist nugget, new SMG fire sound, new sniper fire sound.
soundadd: Lots of new weapon operation sounds such as racking and bolts and the like.
imageadd: New sprites for the Riot Shotgun, Combat Shotgun, c20r, Deagle, m90, double barrel shotgun and 1911 by Memager.
imageadd: All gun sprites that were pointing to the left have been flipped to point to the right.
balance: Shotguns now can be pumped faster.
balance: Bulldog can now be tac reloaded
balance: Sawn off shotguns now have an accuracy penalty and recoil
/cl
2019-02-04 10:27:01 +13:00
81Denton
21fd1b2cea Ports wheelchairs from Hippiestation (#42401)
* Ports wheelchairs from Hippiestation

* Apply suggestions from code review

Thanks Cyberboss!

Co-Authored-By: 81Denton <32391752+81Denton@users.noreply.github.com>

* Removes unneccessary vars+attackby(), uses obj_destruction()

* Uses overlay SS and moved()

* removes redundant else, GetComponent(), moves has_buckled_mobs() to Destroy(), etc.

* Apply suggestions from code review

Co-Authored-By: 81Denton <32391752+81Denton@users.noreply.github.com>

* Removes unneeded has_buckled_mobs()
2019-01-24 09:25:23 -05:00
Tad Hardesty
3b2c0e27f7 Scope various unscoped locate() calls (#42195)
* Scope locate calls which are immediately checked against a list

* Remove silly use of locate from bible Topic

* Scope various locate calls (needs testing)

* More WIP

* Buff up lightswitches while we're here

* Tidy record browsing code

* Scope a few more locates

These have caused problems in the past (#41917, #39303). Continues #29349.

Also cleans up lightswitch code while I was already touching it.

I recommend a testmerge.
2019-01-06 20:39:27 +13:00
Qustinnus
62f61a5867 [READY]New durathread content and durathread modifications (#41959)
* durayeet

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

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

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

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* Update code/modules/clothing/masks/miscellaneous.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* Update code/modules/clothing/under/miscellaneous.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* yeet

* adds armor

* webedits yeet

* adds crafting stuff and removes normal cloth crafting

* ff

* final fixes

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

Co-Authored-By: Qustinnus <Floydje123@hotmail.com>

* done
2019-01-02 14:31:06 -05:00
subject217
73c070346c Adds Diagnostic HUD sunglasses (#41491)
* diag hud sunglasses except it merges

* medical hud sunglasses fix
2018-11-15 12:50:34 -05:00
MrDoomBringer
3413669221 [ready] Prevents trying to use explosive lances as an ingredient in crafting explosive lances (#41223)
When making an e-lance, the recipe would try to use e-lances as an ingredient, only failing after the do_after() proc. This makes it so explosive lances aren't even considered as a possible ingredient for the recipe.

cl MrDoomBringer
fix: You will no longer attempt to use an explosive lance to craft an explosive lance
/cl

This PR also lays a foundation for blacklisting other subtypes in crafting recipes.
2018-11-07 21:49:20 +13: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
MMMiracles
5ee8a6bb1f Adds clothing production for Botany (#40563)
cl MMMiracles
add: Botany can now grow cotton to produce cloth for various jumpsuits.
add: Cotton can be mutated into a much more durable strand, allowing for the production of crude armor.
add: Rainbow flowers, an alternative for clothing dyeing, is obtainable through cargo's exotic seed crate.
add: A loom can now be crafted with some planks so you can actually weave that cotton into a usable fabric.
add: Fannypacks, softcaps, beanies and scarves are now craftable with cloth and dyeable.
/cl

[why]: A way to produce clothing and naturally obtain cloth past ripping up other stuff seemed useful and with the economy aspect, might actually have some extra use.
2018-10-03 10:13:34 +13:00
vuonojenmustaturska
de357a79d8 Adds plasmaglass shards, they can be made into spears (#40327)
* stuff and things

* adds back missing gonbola

* remove useless var

* slapcrafting fix

* transfer memes
2018-09-19 23:05:43 +02:00
TheDreamweaver
ef36fe6d64 Adds Gonbolas (#40224)
* Adds Gonbolas

* Gondolafied the status effect a bit more.

* Corrected documentation

* -Restructured status effect handling for better efficiency
-Rebalanced stats

* Fixed qdel
2018-09-12 23:51:22 -04:00
Cw 3040
c70a956703 Adds Improvised Jetpacks (#40060)
* Adds Improvised Jetpack

-requires two RED oxygen tanks (they have to be RED goddamnit), one fire
extinguisher, three pipes, and thirty cable coils.
-volume less than 1/3 of regular jetpacks
-starts empty
-looks like a red jetpack

* I think this is how you do it

-new sprite courtesy of Obscolene
-i actually don't know if this is the right way to add sprites please
don't yell at me

* adds random chance for jeptack to cut out

-1 in 250
-it's more annoying than anything
2018-09-09 17:49:22 +03:00
81Denton
197efc0028 Turns laser techshells into scattershot shells (#40127)
* Turns laser techshells into scattershot shells

* Changes projectile to 6 weak laser beams

* removes armor penetration from scattershot laser projectile
2018-09-07 14:46:23 -04:00
XDTM
e877aaf186 Fixes a few minor issues (#39940) 2018-08-28 13:05:10 +03:00
CRTXBacon
25d1b83200 Adds intelliTater, a portal themed intelliCard skin. (#39844)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Update recipes.dm

* Update aicard.dm
2018-08-23 10:12:18 -04:00
Tlaltecuhtli
d7976b50fa You can now make mouse traps (#39375)
Mouse traps are craftable from cardboard and a metal rod.
2018-07-27 13:55:04 -07:00
Winterous
5e79b65ce7 Adds a craftable ghost costume (#38809)
* Adds ghost sheet

* Update miscellaneous.dm

* Update miscellaneous.dm

* So uh

I didn't consider what it would look like when you hold items in your hand while wearing this. So, extremely weak justification!

* Add UNDER_HEAD_LAYER

* Update miscellaneous.dm
2018-07-03 18:43:46 -04:00
ShizCalev
ff532a4ca4 Spellchecks TGStation 2018-06-19 18:57:44 -04:00
CitrusGender
7a9d014bf3 Fixes flamethrowers not able to be crafted (#38139)
Adds tools to [other] list so they can be included in crafting recipes
2018-05-29 15:30:20 -07:00
vuonojenmustaturska
fd4c753a04 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 (#37597)
* kill BANG_PROTECT_2

* let's put this back in

* dirty

* kill OMNITONGUE_2

This is a write-only variable, probably leftover from some refactor years ago

* kill flags_2
2018-05-02 14:13:41 -04:00
Denton
f45d8106b7 craftable HUDsunglasses 2018-04-30 10:44:09 +02:00
Fox McCloud
057aa31cda Kills off /obj/item/device (#37297)
* Kills off /obj/item/device

* whoops

* whoops

* Fix
2018-04-23 15:00:23 +02:00
Jordan Brown
e01ac07203 Merge pull request #36721 from GrayRachnid/fix-crafting-tools
Fix crafting tools tooltips
2018-04-01 23:01:57 -04:00
Davidj361
1e9993b130 Fixed table crafting with tools in surrounding area (#36786) 2018-03-30 21:08:24 +02:00
GrayRachnid
6972812ccf tunnel vision is a bitch 2018-03-29 23:10:06 -04:00
John Ginnane
c3627c2741 Adds guillotine (#36540)
* Add guillotine to the game

Can be found in BoxStation's courtroom. Also added some sounds to the clap emote, which is used during execution

* Made requested changes

* minor typo

* Updated code

* Added crafting recipe and removed from map
2018-03-28 10:41:03 +13:00
GrayRachnid
45899124a4 makes both defines and path tools display properly in the tooltip 2018-03-25 15:14:21 -04:00
Denton
c0fee71543 don't git and drive kids 2018-03-22 21:40:19 +01:00
Denton
389e47dbe5 craft menu capitalization 2018-03-22 12:54:32 +01:00
Qustinnus
90c7ad31d5 fix (#36580) 2018-03-21 22:55:55 -04:00
ACCount
6de835a629 Adds tool_behaviour support to crafting, door wires, surgeries and mech construction (#35384)
* Adds tool_behaviour support to construction datums (mech construction)

* Adds tool_behaviour support to wire datums

* Adds tool_behavior support to surgeries

* Adds tool_behavior support to crafting

* New proc, to be used for checking tool qualities in hands

* Improves tool quality support on wires
2018-02-12 20:52:11 +01:00
vuonojenmustaturska
c4fd8715a5 Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#35291)
* Ore Stacking

* honk

* honk

* component memes

* honk2

* fix overlay off-by-1, sheet singular names

* Give the ores more descriptive names since sheets also have

* whoops debug memes

* atom editor memes

* fixes

* snowdin fix
2018-02-05 22:27:35 +01:00
PKPenguin321
fa08aaf7fe adds extendohands (#34599)
* adds extendohands

* adds to arcade prizes, crafting menu
also adds an alternate named/desc'd version for arcade prizes

* removes the else

* actual conflict fix instead of accidental revert

* ACME -> acme
2018-01-29 18:36:35 +02:00
MMMiracles
5b9eeb8935 Adds adorning spears with heads (#33955)
* get spiked, son

* bonespear variant

* cyberboss changes + pixel shifting

* Move 👏 overlay 👏 calls 👏 to 👏 update 👏 icon

* git yer head on a pike here, 25 cents

* ignore that .gitignore

* variable change

* changes n stuff

* may of forgotten that bit

* moved vars up + drop_location()

* null the nulls
2018-01-05 08:48:07 -08:00
ACCount
40699a8aea [READY]Refactors reagent container types (#33470)
* Replaces a bunch of manual OPENCONTAINER checks with helper procs

* Removes unnecessary vars

* Updates reagent bitflags, adds some new ones

* Replaces most of the is_open_container calls with more specific ones

* Puts new AMOUNT_VISIBLE flag to use

* Uses new helper procs in more objects

* Standardizes chemicals logging

* De-snowflakes two more checks

* Fixes

* Minor fixes and improvements
2017-12-18 22:55:01 -06:00
kevinz000
5182128d2a refactors riding datums to a component, vehicle refactor staging for mech overhaul (#32249) 2017-12-04 10:33:01 +13:00
Kyle Spier-Swenson
8c4885cf6e Revert "Ore Stacking (#33062)"
This reverts commit 8e1ac5720d.
2017-11-28 22:56:54 -08:00
kevinz000
8e1ac5720d Ore Stacking (#33062) 2017-11-28 21:27:34 -05:00
brettdavies1995@gmail.com
7b8d1961fb Enables bolas in crafting 2017-11-19 06:59:04 +00:00
Jordie
8b19b490d1 JSON feedback (#32188)
* wip

* wip2

* makes code actually compile on 511 + fixes

* versioning

* s

* adds python conversion script, schema change and removes 'force ' from item_used_for_combat

* fix to compile

* forgot to actually commit this
2017-11-17 02:43:12 -05:00
ACCount
b5e074661f Refactor of catpeople mutant organs (#32101)
* Refactor of cat mutant organs

* Damage multiplier for ears
2017-11-01 21:14:34 +01:00
Mercenaryblue
9b8eae364b Honkbots Tablecrafting
You can now tablecraft Honkbots.
2017-10-31 12:26:07 -05:00
Emmett Gaines
825ab4def4 [512] The great \ref purge (#31824)
* The great \ref purge

* cleanup
2017-10-28 17:20:04 -04:00