Commit Graph

149 Commits

Author SHA1 Message Date
Emmett Gaines
ab3a127295 Makes the global materials lookup lazily initialized 2020-02-03 10:17:13 -05:00
Qustinnus
8337ccac44 Fixes integrity issues related to datum mats (#48586) 2020-01-07 10:02:18 -05:00
ArcaneMusic
39b58f1edc Adds several more uses for plastics (Trinkets, Trash, Decor, and Killing the Environment) (#48337)
* Initial Commit, Plastic Boxes and Soda Rings. Basic carp interaction.

* Beads, trash created from breaking plastic, carp eat plastic properly.

* Cleans up sprites, adds designs to autolathe, and adds plastic plants

* Icon Conflict more like Ion Comblict because I can't spell

* Oh neat, there's already a party crate. Added Beer/Soda 6packs to the crate, adjusted price accordingly.

* Aaaaaaaaaa runtime loop.

* You win this round travis.

* Makes the in-hand sprite the soda can sprite because honestly it's close enough don't @ me

* Typo.

* Merge conflict, style changes, FINE CARP DON'T BREATHE.

* BEGONE CONFLICT BEGONE FROM ME
2020-01-03 02:13:43 +01:00
spookydonut
2591ce17a6 Travis EOF newline detection v3 (#47539)
* scream

* aaa

* aaa

* new one
2019-11-04 19:16:50 -08:00
ArcaneMusic
6e238392bf Adds several different uses for plastics (Cups, Utensils, Folding Chairs, Station Signs) (#47486)
* Initial PR, Cups, Utensils, Signs, Chairs

* Endline fixes for travis, adds plastic utensils to the initial node

* Makes bar invisible, addtimer added, fixes potential dmi/dm conflict

* Fixes Merge conflict take 2

* Wraps the chair snapping proc in invoke_async

* Cleans up Async Call a smidge
2019-11-02 20:30:35 +01:00
MrPerson
a0753d6ca3 Improved material colos
Gave better color matrices to some materials. Simplified some of the existing matrices down. Gave uranium a standard color since it didn't need a matrix. Made bananium obnoxiously bright. Made gold slightly less bright. Made diamonds somewhat brighter. Made glass actually look like glass, it was almost grey before wtf.
Improved some of the greyscaled sprites used by materials, many of them were too dark and/or straight reused from other things. Some of them weren't even grey come on guys.

I'll add some pics later.
2019-10-30 23:37:31 -05:00
kingofkosmos
52325eda25 Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1
# Conflicts:
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/structures/beds_chairs/chair.dm
#	code/game/objects/structures/lavaland/geyser.dm
#	code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
#	code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
#	code/modules/paperwork/contract.dm
2019-10-17 06:02:06 +03:00
KomradeSpectre
9ff071af60 Clockcult Removal 2019 (#47057)
* Nanotrasen fires the Wave Motion Gun at the Clock Cult

* Fixes a random changelog appearing from the reebe void.

* Fixes a wrong type reference regarding the bronze sheets in the Lavaland Ruin for it.

* Fixes redundant cells after CC removal in ruin by populating them with varied ore chunks, or destruction clutter.

* why is it /obj/item/stack/sheet/metal but not /obj/item/stack/sheet/iron

* Fixes the lavaland ratvar ruin to have fluff variant structures of deleted shit it referenced instead what I thought was reasonable.
2019-10-15 10:13:41 +02:00
Qustinnus
908ccfe7b3 Fixes some material datum bugs (#47049)
* fixes

* chair

* ass

* fixes

* dumb

* done

* fix
2019-10-14 00:36:56 -04:00
kingofkosmos
280d416d4f Adds missing spans, missing periods and missing span endings. Also changes spans to suit the situation better. 2019-10-12 19:34:11 +03:00
Qustinnus
a394ccdc2b Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)
removes materials list from items, uses custom_materials instead. This might introduce some bugs so we should testmerge this for a while (and Ill test stuff locally as much as I can)

this also adds material crafting to sheets. Test case being chairs. In the future we can add stuff like tables, walls, doors etc.

also applies materials to everything, with fixes, which can close #46299
2019-10-08 11:06:02 -04:00
81Denton
23123404f4 Chameleon projector exploit fixes (#46827)
* Stops Chameleon projectors from scanning stealth implant boxes

* Also stops holosign scanning

* Dab on mimes

* Replaces mime typepath checks with alpha/invisibility checks

* Alpha/invis checks

* Removes typepath check
2019-10-01 16:56:03 -04:00
variableundefined
900483ba44 Remove redundant structure/chair/wood/normal typepath (#46443) 2019-09-15 00:29:23 -07:00
kingofkosmos
8358169b8e New 'hear' span class (#46369)
* Reverts italics-span back to no color.

* Cleans up many extra spaces and indents.

* Adds 'hear' span class.

* Replaces all 'italics' used in heard messages with 'hear'.
2019-09-14 23:56:34 -07:00
Rob Bailey
2029163d33 playsound vary boolean define conversion (#46254)
About The Pull Request

Converts every single usage of playsound's vary parameter to use the boolean define instead of 1 or 0. I'm tired of people copypasting the incorrect usage.
Also changes a couple of places where a list was picked from instead of using get_sfx internal calls

This was done via regex:
(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\)) to match 1
(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\)) to match 0
full sed commands:
/(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\))/\1TRUE\2/ 1 to TRUE
/(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\))/\1FALSE\2/ 0 to FALSE

I'm not very good with regex and these could probably be optimized, but they worked.
Why It's Good For The Game

Code usability
2019-08-30 18:45:20 +12:00
kingofkosmos
df1fecc58c Adds notice-span to visible_messages with no spans (#46044)
About The Pull Request

Adds 'notice' span class to all visible_messages which had no span class, making all those black messages blue.
Why It's Good For The Game

This should help differentiate action-messages from talking-messages in the chat. More actions will be blue, thus black talking-messages should pop out more.
2019-08-26 20:50:00 +12:00
tralezab
4fa0d761a8 song for this fix: Enigma - Modern Crusaders (#45936) 2019-08-16 21:12:21 +02:00
nemvar
0cb92c724a Fixes that one issue (#45717)
You can no longer pick up sofas
2019-08-05 11:50:22 -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
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
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
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
4dplanner
72fc9bb043 Fixes wheelchairs [TESTMERGE ME :)] (#42894)
Changelog

cl
fix: Buckle objects can now properly specify lying angle
fix: Wheelchairs and other such vehicles let you use UIs even if your legs don't work
fix: You can now pull objects while in a wheelchair even if your legs don't work
fix: You no longer have a chance of sleeping upside down in a bed
tweak: No longer randomises lying direction a second time on fall
/cl

code: simplified can_stand code

fixes #41703
2019-03-17 23:22:01 +13: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
nicbn
c4213f13ab New() -> Initialize() (#41876) 2019-01-03 18:56:15 -08:00
kevinz000
45b5bc20fb Adds sofas 2018-12-02 10:21:19 -08:00
swindly
45e67977d7 makes chairs drop rods 2018-10-13 20:49:47 -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
2fa1ac1349 Replaces istypes with the proper tool_behaviour checks. (#40414) 2018-10-01 03:10:31 +03:00
zaracka
35fbbad96c New shuttle chair sprites by Ausops (#38953)
* Revert "fixes them not showing up"

This reverts commit 8ffe48a336.

* Revert "Credits the original author + moves shuttle chairs to goon/icons" while keeping goon shuttle chair dmi

This reverts commit 82694bcf3b while keeping goon shuttle chair dmi.

* Revert "ports shuttle chairs from ftl"

This reverts commit 3eb3f741ad, reversing
changes made to bc272c89fa.

* New shuttle chair sprites by Ausops

* Deletes goon shuttle chair dmi
2018-07-10 00:17:13 +12: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
praisenarsie
8ffe48a336 fixes them not showing up 2018-06-22 16:40:40 +01:00
praisenarsie
82694bcf3b Credits the original author + moves shuttle chairs to goon/icons 2018-06-22 16:31:15 +01:00
Dax Dupont
d0ccc6753c ports shuttle chairs from ftl 2018-06-20 23:45:00 +02:00
Jordan Brown
f8dd1dda85 Fix some shuttle chair stuff (#38557)
* Fix shuttle chair stuff

* Remove redundancy
2018-06-19 02:29:38 -04:00
fludd12
9f564d539b Adds New Shuttle Chairs (#38539)
* I'm crashing this shuttle with no survivors.

* comma comma comma comma comma chameleon
2018-06-17 12:16:48 -04:00
vuonojenmustaturska
9c0b5fa881 Turn /datum.isprocessing into a datum flag (#38193) 2018-06-05 15:59:46 -07:00
Cruix
251c54223d Added a new ability to sentient diseases (#36548)
* Replaced body zone magic strings with defines

* Added the Secrete Infection ability to sentient diseases, and updated the infective component
2018-03-30 21:09:19 +02:00
Ashe Higgs
d1edd8f505 Alternative PR to brass apples: Adds bronze sheets (#35874)
* Adds bronze sheets

* nope!
2018-03-02 13:35:58 +13:00
oranges
82af086fd8 Merge pull request #35542 from ShizCalev/free-spam-removal
Cleans up some duplicate canusetopic warnings
2018-02-16 15:34:37 +13:00
ACCount
c6e607dc17 Refactors use_sound and changes the way tools play sounds (#35521)
* Adds list support to usesound, ports drills to usesound

* Adds more tool sounds, changes usesound usage to play_tool_sound

* fix
2018-02-12 17:16:47 +02:00
ShizCalev
3cb6ab32d2 Cleans up some duplicate canusetopic warnings 2018-02-11 09:56:43 -05:00
ShizCalev
bfde5ac057 [s] Fixes altclick exploits (#35456)
* Fixes altclick exploits

* Removed free spam, fixes monkey altclicks

* replaced named args with proper defines

* More cleanup and fixes

* Better yet

* Another exploit fix

* pet carrier fix
2018-02-11 16:06:12 +13:00
Xhuis
48de810fbd Kills tactical brass chairs 2018-02-05 15:51:56 -05:00
kevinz000
b974fc4fb4 Xeno nests are no longer held together by bolts. (#34766)
* Update bed.dm

* Update alien_nest.dm
2018-01-24 00:56:53 -05:00
AnturK
53909747c8 Simple rotation component. (#34476)
I'm going to port other rotations to it when i don't feel lazy.
Closes #34064
2018-01-23 21:09:15 +13:00
MrDoomBringer
20a6c0cdd7 Adds ~70 more suicides (#34522)
Does what it says on the tin, probably a terrible idea
2018-01-23 20:38:31 +13:00
vuonojenmustaturska
a162837faf Replaces a bunch of loc assignments with forcemoves and moves to nullspace (#33465)
* big batch of loc assignments

* Update emergency.dm

* Update spiders.dm

* Update parrot.dm

* Update ripley.dm

* Update firealarm.dm

* seems to work

* this maybe works?

* brainmemes, again

* stuff

* fix brainmob, camera runtimes
2017-12-13 20:56:39 +01:00
kevinz000
5182128d2a refactors riding datums to a component, vehicle refactor staging for mech overhaul (#32249) 2017-12-04 10:33:01 +13:00
ShizCalev
b0f24a892b Fixes bartender suit having an adjust state (#32968) 2017-11-22 13:40:11 -05:00