Commit Graph

645 Commits

Author SHA1 Message Date
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
Coconutwarrior97
0ec507f8ad Changes 1 and 0 values to True and False. 2018-10-24 22:15:28 -05:00
Coconutwarrior97
e75110a609 Allows Grilles to be built on space tiles. 2018-10-22 15:38:08 -05:00
MrDoomBringer
703a365aec Various code improvements (#40932)
* adsf

* asdf

* take these

* Further cleanup to windoor code
2018-10-21 03:01:02 -04:00
ShizCalev
ca57ca7bee Fix being unable to stuff money into IDs (#41006) 2018-10-19 22:17:28 -07: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
MMMiracles
e5c1a858cb durathread fix (#40685) 2018-10-05 04:33:58 -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
ShizCalev
2fa1ac1349 Replaces istypes with the proper tool_behaviour checks. (#40414) 2018-10-01 03:10:31 +03:00
FantasticFwoosh
f70698b7cc Adds fancy boxes to cardboard crafting & flour sacks + UE designs to biogenerator. (#40394)
* Adds fancy box types to cardboard recipies

So now with co-operation the chef can mass stock eggs & donuts, while the chaplain can hold reserve candles.

* Tidies up syntax

Missing comma threatens derail, oversight fixed.

* Adds UE & flour sacks to biogen designs

Adds universal enzyme (reagent transferred into biogenerator container) & flour sacks to the biogenerator designs.
2018-09-29 02:03:23 +03:00
Iamgoofball
f735a7d34d [READY][PAID CODE] economy PR (#40312)
With the power of CAPITALISM AND ECONOMY, you too could be This Guy.
2018-09-23 02:50:51 -04: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
Mickyan
8c811d4b99 Gauzes can be deconstructed with any sharp object (#40243)
* gauze can be deconstructed with any sharp object

* requested changes

* more requested changes
2018-09-13 14:04:25 -04:00
Militaires
4cbd009876 [READY] Gondola Fur Products and Gondola Mask Voice Changer (#39670)
* Gondola Fur Products

* hands filled in

* voice changer

* perfect

* epic >>>> ebin

* removes Ecks Dee
2018-08-18 15:26:59 -04:00
Patrick Chieppe
2c8248575a Logging system refactor and improvement (#39521)
* Refactor several log lines to use datum_info_line and atom_loc_line

* Add default return strings from datum_info_line and atom_loc_line

* Add parentheses around atom_loc_line data

* Change more logs to use atom_loc_line

* Add check in atom_loc_line for turfs to avoid calling get_turf on them

* Re-add removed 'at'

* Replace datum_info_line with key_name and atom_loc_line with loc_name

* Refactor logging functions

* Avoid double-logging self-interactions

* Fallback to simple stringification if all else fails in key_name()

* Rewrite muscle spasm logging to use log_message

* Standardize logging of martial arts

* Tweak individual logging panel look

* Fix individual logging panel source

* When I typed || I really meant &&

* Fix Telecomms logging always showing client logs in the panel

* Reverts addition of buggy ownership log to panel

* Remove colon

* Fix missing log_directed_talk tag

* Add warning for missing type in log_direted_talk

* Change warnings to stack_traces

* Add square brackets around fallthrough key_name() case to help parsing

* Allow atom arguments/src in log_*() functions

* Change log_combat call with null argument to log_message

* Change mecha types' log_message() arguments to match atom and mob version

* Add key_name() case for atoms

* Fix resist_grab() unsetting pulledby before log_combat gets a chance to use it

* Fix log_globally logic

* Add logging for hitting objects with items

* Move log_combat() to atoms.dm

* Use utility functions for object stringification in log_combat()

* Use utility functions for object stringification in log_combat()

* Add missing logs for interacting with display cases

* Rewrite log_combat() comment

* Add missing space in log_combat()

* Add logging for hitting grilles barehanded

* Add missing ..()
2018-08-12 21:41:09 +02:00
81Denton
05fb1c7b7f Adds five new cargo packs (#39569)
* Adds four new cargo packs

* god dang it bobby

* adds wrapping paper crate

* reduces carpet crate price, since it's a bunch of useless carpet

* adjusts festive crate price to 1000 bucks
2018-08-08 20:58:40 +03:00
Irafas
90811b9786 Fixes players being unable to construct on the same tile as a directional window (#39088)
* Can build on top of windows

-Players can now build things while standing on the same tile as a directional window.

* Changed the check for fulltile

-This actually covers all fulltile windows

* No more stacking windows

-Full tiles can no longer be built on top of directional windows
-Directional windows can still be built on the same tile as long as they dont face the same direction

* Now contains 50% less IF!!

-Put both if's into one

* Still pretty fucky

-If the dir of the constructed object has var fulltile set to TRUE then FULLTILE_WINDOW_DIR will be passed to the method valid_window_location else the user's dir is passed.

* just a space

* Now gets initial dir of object being built and passes that to valid_window_location
2018-07-18 10:26:53 +02:00
81Denton
044279e845 Adds missing merge_type to mineral sheets (#39054) 2018-07-11 13:15:30 +03:00
Trevor Serpas
bee0b5b2c3 Afterattack() Signal (#38606)
* adds signal and modifies each call of afterattack to call it's inherited proc

* uses new macro for sendsignal()

* map fuck

* skip precommithooks

* combine and negate 2 ifs
2018-07-07 02:00:25 -04:00
AnturK
d71b205133 Clears stuff detected by SM's parser. 2018-07-03 12:32:06 +02:00
Tad Hardesty
211978cbb2 Fix light tile creation 2018-06-30 12:33:49 -07:00
ShizCalev
89752866aa Merge branch 'master' into spellcheck 2018-06-26 16:43:41 -04:00
YPOQ
d4136f4a65 Fixes gulag stacker not giving points after RPG loot event (#38570)
* Fixes gulag stacker not giving points after RPG loot event

* Moves point values to type vars

* cleanup
2018-06-21 17:30:13 -04:00
ShizCalev
ff532a4ca4 Spellchecks TGStation 2018-06-19 18:57:44 -04:00
Tlaltecuhtli
fd6812acf0 sdasd 2018-06-13 14:38:24 +02:00
vuonojenmustaturska
c65a99f130 Move NODROP_1, DROPDEL_1, ABSTRACT_1 and NOBLUDGEON_1 to item_flags where they belong (#38171)
* (mostly) nodrop

* (mostly) dropdel

* (mostly) abstract

* nobludgeon

* things i missed

* forgot one

* unintended changes

* energy handcuffs
2018-06-01 11:36:31 +02:00
ShizCalev
c41d6ac965 Standardizes and cleans up some admin messages & logging (#38128)
* Improved logging

* Fixes & emitter logging

* ded
2018-05-30 21:57:06 -07:00
Jordan Brown
f3db0f57e0 Merge pull request #38023 from AutomaticFrenzy/patch/toh-kay
Fix various bugs with telekinesis
2018-05-25 11:48:50 -04:00
MrDoomBringer
32c8d0abc5 Cargo Update: Cargo Supplypod Beacons! (#37345)
(THE CODEX ASTARTES CALLS THIS MANEUVER: STEEL RAIN) [New sprite!]

* file

the boy

asdh

beacon overlays

first pass complete bring out the drinks boys

fixes!

fixes!

whups fix name

speed

makes coffin a crate to prevent runtimes

sprite fuckup:the musical

whups more fixes

why tf was screengen modified???

TO THE FILE

devices

changes things

p[omf pomf

uhg

alright fuk it

issue fix pt 1

in which i make merge conflicts my bitch

by fixing devices.dmi and tgui.js

oh shit

forgot about the items repath

hm

nah

merge conflict a

then all ya gotta do is whip

* shiv review me code reeeeeeeeeeeeeeee

* rebase conflict

* anturk

* asdf

* wooooeeeeeeh makin bacon

* dont forget about lil old me

* id like to give a shoutout, to my man spacemaniac. on the soul plane. rip in peice, my bugs. rip in peice

* spacy man what is ur spacy plan

* 1st

* 2nd

* organization also a thing

* so i figured out why defines didnt work sometimes across files. this fixes the last issue rn

* forgot to cop the commit

* fuck how am i so stupid

* adds comments and agrees with spacemaniac

* asdfghjk
2018-05-24 17:02:51 -07:00
Tad Hardesty
7a83c0dca5 Fix TK teleporting filled sandbags 2018-05-23 16:49:27 -07:00
vuonojenmustaturska
8f72860a48 Merge pull request #37846 from DaxDupont/axe-time
Small cult nerf do not be alarmed robustin think about your heart
2018-05-16 12:46:30 +03:00
Dax Dupont
d2ad0bd603 Kills bloodcult space base memes 2018-05-14 19:17:25 +02:00
FrozenGuy5
12a9090400 Add plasma rein glass to the ORM & adjusts material values on the various glass sheets (#37464)
* Update smelting_designs.dm

* Tweaks material values on titanium glass.

* Optimizes math & fixes errors and inconsistencies
2018-05-12 23:04:07 -07:00
Mickyan
01f9f56ea7 Makes gauze deconstructable into cloth (#37731)
* deconstructable gauze

* I guess this is unnecessary?

* attackby to wirecutter_act

* changes requested by SpaceManiac

* formatting

* spelling

* changes requested by SpaceManiac mk2
2018-05-12 17:14:30 -07:00
YPOQ
ceb9798625 Fixes stacks created with 0 amount 2018-05-09 20:28:54 -06:00
YPOQ
c26a19d523 Removes recursion 2018-05-09 17:37:03 -06:00
YPOQ
6327b79db6 New stacks now auto-split if amount > max_amount 2018-05-09 13:53:47 -06:00
YPOQ
2b141c3e39 Fixes new stacks getting merged before the stack size is set 2018-05-08 22:20:56 -06:00
ShizCalev
ba1030f803 Makes more messages pronoun sensitive (#37582)
* Makes more messages pronoun sensitive

* Some cleanup

* more pronouns

* rever
2018-05-03 18:45:55 -04:00
Jordan Brown
d132f97061 Merge pull request #37568 from pigeonsk/removeenruranium
Removes enriched uranium
2018-04-30 22:16:02 -04:00
Jalleo
5d2db204bc [s] Small tweaks and fixes a edgecase with machine construction (#37494)
* Puts back required time for the emitter and field_generator and also removes a certain issue that certain people were causing

* Couple of things I missed

* I noticed the error with regards to atom and changed to obj like I was trying to originally. Also its fine to build on tables that wasnt the issue with this specific aspect.

* Edge windows. We need those.

* optimised the checks to be behind a if check for when you are actually needing to make something for the floor...

* Corrects a input proc by request

* Working is not my strong suit.
2018-04-30 13:01:43 +03:00
Pigeons
cc1391fc68 Removes enriched uranium 2018-04-29 20:26:58 -04:00
pigeons
96e384448c Actually links mineral sprites with their new location (#37564)
Fixes sprites being broken
2018-04-30 12:07:47 +12:00
Grandmother of 50
14f26a1707 Replaces a / with * as per Contributing.md 2018-04-27 15:29:25 -04:00