Commit Graph

688 Commits

Author SHA1 Message Date
nemvar e587b970da Adds parent calls to almost all tool_acts (#45582)
* Adds parent calls to almost all tool_acts

* actually compiles
2019-08-03 22:25:57 -07:00
Twaticus c2ce4562fc Inhand sprites for tiles #45611
About The Pull Request

Unique floor tiles now have their own unique inhand sprites. Moved floor tile inhands into their own file.
Why It's Good For The Game

Floor tiles okay.
Changelog

cl
imageadd: inhand floor tile sprites
/cl
2019-08-01 20:46:43 +12:00
Rob Bailey 6a26744d83 Clothing /under repath (#45548)
About The Pull Request

repaths clothing/under to be more sane
Also fixed a couple of bugs relating to pathing being incorrect, and modified a couple of bad descriptions and names
Also adds a map path updating script, which also helps show the full repath.
Why It's Good For The Game

improves maintainability, makes mapping easier, stages for a clothing dmi split
Changelog

cl
refactor: repathed all under clothing, keep an eye out for errors
/cl
2019-07-30 19:20:21 +12:00
FantasticFwoosh c85080e490 Fixes fake basalt tiles costings (#45445)
Stack recipie now relies upon 'glass ores' to craft, which when the tile is dug returns 2 sand, the same amount to craft one fake volcanic tile, ending the exploit.
2019-07-25 23:12:40 -07:00
Qustinnus b33d1c49a3 [READY] Floydmats (Datum materials) & custom toolboxes (#45118)
* Initial work

* more

* ass

* wsedfwedff

* asss

* test

* stuff

* fuck

* sss

a

* kms

* asdadwedwdfwefwef

* start

* test

* dwwdew

* ewefwfef

* Redemption machine (#8)

* Redemption machine

* Removes debug messages

* changes

* fuckmyshitup

* coin mint works with new material shenanigans (#10)

* Auto stash before merge of "materials" and "origin/materials"

* woops

* furnace (#11)

* autolathe manufacturing of toolboxes

* eggs in a basket

* some small changes

* matcolors

* documentation

* more documentation and effects

* done

* Color man bad (#12)

* fixes designs

* ass

* more fixes

* fuck me

* firestacks adder

* epic fixes

* fixes designs

* DONE DIDDILY DOO

* removes category macro

* ch-ch-ch-changes

* fixes some stuff

* Fixes display of ore values (#9)

* Redemption machine

* Removes debug messages

* Re-adds value display

* Replaces the fire stacking component with an element instead (#13)

* fixes examine

* fixes ligma bugs

* double ligma boofus

* fix

* misses some defines

* fixes ORM

* Update code/datums/components/material_container.dm

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

* fixes

* Makes glass objects weaker (#14)

* Makes glass objects weaker

* uses correct proc

* fixes shit

* honk honk

* better

* oh shit oh fuck

* fixes

* fuck ORMs

* fixes the biogen

* documentation

* ass (#15)

* component

* changes

* ass

* ass

* doc

* Auto stash before merge of "materials-plasmacomponent" and "origin/materials-plasmacomponent"

* fixes rounding

* fixed
2019-07-24 11:27:01 -04:00
nemvar 876db778a7 Durathread and loom changes. (#45261)
* Reworked loom and cloth

* newline

* Removes unneeded .=

We were returning TRUE regardless.
2019-07-21 17:40:00 -07:00
Rob Bailey 440e1b19d2 fixes runtimes related to trash in nullspace (#45160) 2019-07-13 00:42:21 -04:00
cacogen 85ca0d5272 Adds stats to creation/destruction of cleanable decals and trash on station (#44989)
* Adds stat tracking to mess on station

* Checks for maint to make sure stats aren't counting maint trash which is irrelevant to the janitor

* adds mapload arg to init

* asdasd
2019-07-12 14:11:23 -07:00
ShizCalev d7a9dc0160 Merge pull request #44900 from Dorsisdwarf/Weirdsheet
Makes cosmos bedsheets creatable
2019-07-02 01:13:34 -04:00
ShizCalev 1d836fe9fc Merge pull request #44891 from nemvar/jumpskirtahoy
You can now craft white jumpskirts.
2019-07-02 01:08:02 -04:00
ShizCalev 6e44bd3a93 Merge pull request #44796 from kingofkosmos/addswarningspans
Adds warning-spans
2019-07-02 00:47:43 -04:00
Unknown da84990d64 Makes Cosmos washes achievable
help
2019-07-01 08:37:57 +01:00
nemvar 4e05f7d54a High priority 2019-06-30 22:32:32 +02:00
Tlaltecuhtli c94507576e stacks no longer give you a pop up window when you alt click on one on the floor (#44691)
cl
tweak: stacks no longer give you a pop up window when you alt click on one on the floor
/cl

its rather obnoxious when you try to grab something from a tile (example after an explosion) which has some giant sprites of rod/tiles/metal and you want toalt click to see the tile content but instead you have to pixel snipe else you get a pop up window

99% of the time you want to grab part of a stack you do it in hand or in the bag anyway which have no effects from this pr
2019-06-30 09:52:34 +12:00
kingofkosmos c969f6d3eb Merge branch 'master' into addswarningspans 2019-06-27 15:12:54 +03:00
kingofkosmos ec5c82029a * "Is already...", "Can not...", "Not when..." etc. 2019-06-27 06:15:43 +03: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
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
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
nemvar 947b69770a Refactors medical stacks. (#44415)
* welp

* Revert "welp"

This reverts commit b2f9143468.

* Improves medical stacks.

* visible

* fix
2019-06-11 15:09:56 -04:00
nemvar 08cc067835 Turns sinew cuffs into a cable cuffs subtype (#44354)
* Makes ashwalkers more based.

* grammar
2019-06-10 00:32:34 +02:00
nemvar 94d25d1024 Adds craftable firebrands. (#44376)
* Prometheus

* /aaa
2019-06-08 20:19:42 -04:00
Tlaltecuhtli dab6944369 adds bamboo and fixes sugarcane (#44192)
* 1

* 2

* oh fuck

* kjhgfdfghj
2019-06-06 22:06:47 +12:00
Nalzul 47700b8679 Allows you to wear the caution sign + new sprite for the caution sign (#44289)
* +Sprite +Repath

* Adds 5 brute armor
2019-06-04 11:48:47 -04:00
Emmett Gaines c3f95024b2 Gets rid of the GetComponent macros (#44220)
* Removes the GetComponent macros

* Regex replacement for GET_COMPONENT

Search: `GET_COMPONENT\( *(.+?) *, *(.+?) *\)`
Replace: `var$2/$1 = GetComponent($2)`

* Regex replacement for GET_COMPONENT_FROM

Search: `GET_COMPONENT_FROM\( *(.+?) *, *(.+?) *, *(.+?) *\)`
Replace: `var$2/$1 = $3.GetComponent($2)`
2019-06-04 17:39:58 +02:00
oranges dc80dbda7b Merge pull request #44199 from Suicidalpickles/beegirls2k19
Gauze can now be applied to corpses
2019-06-03 11:04:10 +12:00
zxaber 130e066372 Allows unanchoring and deconstructing of linen bins (#44171)
* linen bins, your time has come

* update

* update
2019-05-31 13:10:27 +02:00
vuonojenmustaturska 6a106bc877 Remove reagent ids and use typepaths where applicable (#44166)
cl Naksu
code: reagent IDs have been removed in favor using reagent typepaths where applicable
fix: mechas, borg hyposprays etc no longer display internal reagent ids to the player
/cl
2019-05-31 21:57:26 +12:00
Suicidalpickles ef021fe428 gauze change
meme
2019-05-29 15:55:00 -07:00
vuonojenmustaturska fb45b7a017 Turns trait accessors into defines, fixes some bugs (#43820)
It's free performance.
2019-05-06 19:44:05 -04:00
Tlaltecuhtli e36a283b41 [ready]ghetto grinder (#43600)
* 1

* 2

* 3

* 4

* grammar

* grinds stack items + no do_after spam

* sprites

* fixix

* Update code/modules/reagents/reagent_containers/glass.dm

Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/glass.dm

Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>

* low energy

* fix

* Update glass.dm
2019-04-30 10:12:49 -04:00
Tad Hardesty 6f4f462933 Add a missing period when splitting stacks (#43604) 2019-04-15 14:40:30 -04:00
ShizCalev c1f7d01334 Repath /obj/structure/chair/office/dark to /obj/structure/chair/office (#43269)
The parent was just a dummy path, no sense having it really.
2019-03-26 20:43:30 -07:00
BuffEngineering 1a557b2d63 Fix high security door material exploit, tweaks cost (#43035)
Fixes an exploit that allowed for infinite metal/plasteel to be farmed off of
high security/vault door deconstruction. Makes completed airlock assemblies
start with no wire security and adjusts the material costs of both doors
accordingly. As the high security airlock was fortified with normal metal
unlike the vault door this is a slight buff to it, but I am fairly sure it
will not affect the game balance noticeably.
2019-03-09 13:19:12 -08: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
Time-Green 52b19df321 makes snow tiles not fucking kill 2019-01-28 15:10:58 +01:00
fluffe9911 d78bb9152b Adds the golem Time-Green was too communistic to add (#42475)
* capitalism is the true way

* better sound clip

* there we go

* fixes mine and time-greens copy pasta

* adds the soviet golem to the human file

* capatalist golems now bleed money

* makes it so both capatlist and soviet golems can now use guns

* hec

* makes the song the U.S.A Anthem to please the copyright gods and removes money bleeding cause im to lazy to do a refactor right now

* Update code/modules/mob/living/carbon/human/species_types/golems.dm

Co-Authored-By: fluffe9911 <dablank02@hotmail.com>

* re

* better sound clip
2019-01-25 15:38:07 -05:00
Time-Green 9861efde71 Cryokinesis and Geladikinesis mutations (#42453)
* Adds cryokinesis and renames the cold resistence file to space adaptation

* adds cryokinesis

* fixes icon conflict

is there actually a proper way to fix them thats not copying master and reimplimenting your own sprites?

* fixes a typo and lowers instability of cryokines by 5

* Apply suggestions from code review

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

* maybe reverts line ending?

* unfucks flags?

* probably unfucks line endings

i swear to fucking god why does it even do this. i never even touched the file and reverting it to master doesnt do anything. fuck you git
2019-01-23 15:20:56 -05:00
Time-Green b245f1ed5a Adds the golem Qustinnus was REALLY too afraid to add (#42402)
Stalinium is currently unavailable, so it's an admin only golem
cl Time-Green
rscadd: Adds glorious soviet Russia golem
/cl
2019-01-22 15:30:46 +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
coiax 02aba6b205 Microwaves now have a single wire (#41822)
cl coiax
add: Microwaves have a single wire accessible when open, the activation wire.
When cut, the microwave will no longer function, when pulsed, the microwave
will turn on.
add: Stabilized dark purple extracts now cook items in your hands, rather than dropping
the cooked item on the floor.
/cl

Previously microwaves just worked on their contents, now they keep a subset of contents called ingredients, because otherwise it would explode whenever you put a signaler inside.

Someone asked me to do it. It seemed like a neat idea. God knows
what horrible things people will do with this.
2018-12-16 12:56:08 +13:00
kevinz000 45b5bc20fb Adds sofas 2018-12-02 10:21:19 -08:00
coiax 446641f329 Repath blindfolds to prevent regular sunglasses creation exploit (#41710)
Blindfolds don't actually need to inherit anything from sunglasses, from what I
can see, unless there's some bad type checking somewhere in the code that I'm
not aware of.

Exploit is: cloth makes blindfold + medHUD -> medHUD sunglasses -> remove
medHUD, regular sunglasses.
2018-11-30 14:21:22 -08:00
XDTM 01f794a153 Teleportation standardization, channels, and interception (#41371)
cl XDTM
add: Spraying holy water on tiles will now prevent cult-based teleportation from using them as a destination point.
tweak: Quantum, wormhole and magic teleportation is no longer disrupted by bags of holding.
/cl

Refactors some teleportation code so it uses do_teleport instead of directly forceMove.
do_teleport now has a channel argument, to specify the type of teleportation used. This will affect what can and cannot interfere with teleportation. For example, BoHs interfere with bluespace teleportation but not wormhole, quantum or magic teleportation.
do_teleport now sends a COMSIG_ATOM_INTERCEPT_TELEPORT signal, allowing the target turf (or anything placing a signal on said turf) to react appropriately. As a proof of concept, blessed tiles use it to prevent teleportation from the cult channel.

Intercepting teleportation can have interesting potential uses, from teleport denial fields, to teleport scramblers (teleports you somewhere else instead), telefraggers that gib anyone unlucky enough to teleport in their area of effect, teleport anchors that shunt all teleportations in a wide area to themselves, and so on.
2018-11-29 10:33:55 +13:00
swindly 4bcd3cdc55 fixes word crimes 2018-11-19 17:56:59 -05:00
4dplanner c84a92f4ce Passes thrownthing to hitby (#41411)
* Passes thrownthing to hitby

* Items now also pass thrownthing

* No longer uses default arguments

Also fixes bananium shield

* Adds more arguments to hitby calls

* Standardises throw_impact

* Clears up some loose ends

* Adds back wacky comment

* Reinstates can_push=FALSE on bananium shield
2018-11-15 10:25:04 +01:00
Jordan Brown 49d4873216 Merge pull request #41183 2018-10-28 14:09:55 -04:00
Jordan Brown a821b10690 Merge pull request #41081 2018-10-28 14:09:49 -04:00
ShizCalev 89428b47d6 Fixes droppers not working if the mob is wearing a hardsuit but no eye protection 2018-10-27 11:49:44 -04:00