Commit Graph

453 Commits

Author SHA1 Message Date
spookydonut
175439f63a Removes unreachable code (#48143)
About The Pull Request

As detected by SpaceManiac/SpacemanDMM#123
2019-12-10 20:52:13 +13:00
Tlaltecuhtli
cda2867984 conveyor belt now are stacks (#47656)
* | || || |_

* weight and prints
2019-11-26 22:58:16 +01:00
ArcaneMusic
d7c6471aa8 Adds 2 Suspender Subtypes, gives suspenders a new toggle, and adds Mystic Robes (#47821)
* Blue, Gray suspenders

* Adds suit toggle for X-Y suspenders for some reason

* Psijic monk robes and hood, toggles, all good to go.

* Cleans up magic pixels, tones down colors.

* Inhand sprites are in.

* Suspenders exist on the map somewhere

* BEGONE FORELORN PIXELS OF YORE
2019-11-25 23:12:05 +01:00
Aleksej Komarov
e87b6c6701 Tgui error reporting, Keyboard passthrough, RPD, NtOS, Power Monitor (#47749)
* Improve tgui fatal error reporting

* Keyboard passthrough in tgui

* New Rapid Pipe Dispenser interface

* Update README with new components

* Release held keys when browser window loses focus

* Power Monitor Interface, NtOS theme and core components

* Yet another CSS rework

* Fix Table, Chart stubs for IE8

* NtOS Main interface

* Supermatter Monitor interface

* Tweak NT color, color + sort gas bars
2019-11-16 04:02:33 -08:00
Firecage
ff42a1590b Ports carbon paper from Bay. (#47691)
* Ports carbon paper.

* Can't fold stacked carbon paper into paperplane.

* Changes some update_icon()'s into update_icon_state()'s

* Does as Action asked.

* Return is returned to the box from whence it came.
2019-11-14 02:56:35 -08:00
Rob Bailey
8ea3632a96 global to static (#47580)
* global to static

* get rid of a dead var
2019-11-06 19:49:20 +01:00
spookydonut
2591ce17a6 Travis EOF newline detection v3 (#47539)
* scream

* aaa

* aaa

* new one
2019-11-04 19:16:50 -08:00
Tlaltecuhtli
2c81143d69 add chem factory related cargo bounty (#47315)
* Update maps.txt

* 1

* 2

* doc

* d
2019-11-02 19:37:28 -04:00
nemvar
372189aad8 Prevent prevent contents explosion proc (#47337)
About The Pull Request

Proc literally only existed to return a boolean. Contents explosion is a clusterfuck anyhows. Basically it works something like this:

If the turf is the epicenter: GetAllContents of the contents and call ex_act on them directly. But it doesn't get the contents of whatever returns true on prevents_contents_explosion.
Otherwise: Call ex_act on the turf which calls the contents_explosion proc which has nothing to do with the prevents_content_explosion proc.

This is barely the smallest droplets of water onto a hot stone.

PR replaces the proc with a bitflag in flags_1.
2019-10-26 21:05:25 +13:00
Rob Bailey
c49367f895 More tgui-next uis (#47333)
* More uis

cargo express console

cargo express routes

ui scale change

delete clockwork slab

chem acclimator proper

codex gigas

gigas cleanup

crew console

crew monitor work

scrap crew console for a later pr

lint fixes + rebuild

get rid of some temp files

get rid of more temp files

much better codex gigas

remove unused file

* rebuild

* rebuild
2019-10-25 11:55:40 +02:00
ATH1909
cbe197b902 Fixes the name conflict between the two different kinds of black powder in a different way (#47288)
* Update pyrotechnic_reagents.dm

* Update pyrotechnics.dm

* Update reagent.dm

* Update misc.dm
2019-10-25 02:39:10 -07:00
81Denton
f5bd6a381d Merge pull request #47052 from kingofkosmos/misc_span_fixes1
Misc span fixes
2019-10-20 18:46:54 +02:00
Rob Bailey
0e1f1ca9a5 TGUI-next static data (#47123)
* static data backend


old tgui compatibility


no more state inlining


better comment


general > data


data > static_data


reference implementation


frontend implementation?


working version

functional manual updating


fix buy privately not triggering ui updates

manual update

rebuild conflict resolution

* Do not read inlined state, adjust object merging priority
2019-10-18 19:22:18 +02:00
Emmett Gaines
8982f509b5 Refactors screen object update_icon to call parent (#47094)
* Refactors screen object update_icon to call parent

And makes update_icon an /atom proc

* Cleans up some missed null checks

The student teaches the master
2019-10-17 18:21:50 -07: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
Aleksej Komarov
5521c8ebee [READY] tgui-next: Initial PR, speedy new Air Alarm interface. (#46764)
* Initial tgui-next commit

* Improve dev server, slight changes to layout.

* Add more components, fix dragging, finalize scrubber list

* Complete an air alarm interface.

* Multiple improvements based on feedback

- LabeledList now has a "buttons" prop, where you can put buttons.
- Improved Box and Flex components
- Whole UI is now dimmable if non-interactive
- Basic documentation of components (Box and Flex so far).
- Icon and Box now accept a "color" prop.
- Routing improved in "Layout" component, you can now specify whether an interface is scrollable.

* Less harsh dimming

* Redux, Toasts

- Fixed inconsistent backend updates with Redux.
- Added Toasts which are currently unused, but are functional.

* acclimator + ai airlock ui

* Add a progress bar component, implement resizing

* Fix a zero in title bar

* Add a linter to keep shit tidy, fix danger level mapping, add some more docs

* better ai door interact ui

* final ai airlock interface

* Fix issues with code, enforce hard 120 line length cap, automerge binaries

* Implement hot module reloading

* Fix progress bar, add color support

* Fix ProgressBar baseline alignment issues

* Remove unwanted padding on the bottom of the LabeledList.

* Component improvements

- Fix baseline issues with Button and ProgressBar components
- Box how inherits props from Box
- Atomic colors and Button colors are now auto-generated, all range of colors supported

* Chem Dispenser UI, animated numbers, more style fixes

* Add an IE8 polyfill

* Intermediate state of fixing IE8

* Lots of shimming and general misery

* Fully working old TGUI chainloader for IE8, more pipeline improvements

* Support title-less Sections

* Delete Yarn, use Lerna for workspace management

* Improve maths and animated numbers

* Fix loss of focus for scrollable content, activate buttons with keyboard

* Attempt to bust the cache, grab focus on keyboard presses too

* Fix hot module replacement by manually pulling replaced modules.

* backend logging

 un-nuke line endings

changes without insane line endings

* helper procs + href support

* slight optimization

* compiles

* Redux, Hotkeys, Kitchen Sink (for UI testing), Tabs component

* Push logs to backend, small kitchen sink changes, tab fixes

* Update component reference in README

* Small fixes

* Next bunch of IE8 fixes, PureComponent optimization for Inferno

* Delete old tgui html

* Log the event of loading the old tgui

* Enable tgui logging on server by default

* Final solution

* Extract routes into a separate file, fix ChemDispenser bug

- Chem dispenser was needlessly disabling transfer amount buttons

* Disable baseline alignment for vertical tabs

* Fix tabs and box units

- Tab content was not taking full page width
- Box can now accepts strings as units, which will be treated as raw style values.

* Fix tgui on Terry

* Fix sending all logs with an "error" flag

* Some macro UI component changes and improvements

- Refer to README.md diff to see what's new

* Tooltip component

* Add support for themes, nanotrasen logo is back

* Clockwork theme hotfix

* Slight adjustment to logo positioning

* Actually proper solution for logo positioning

* Fix color maps

* tgui-next thermomachine interface

* tgui-next canister interface

* Add icon_class_name proc to asset cache

* Lots of stuff backported from actioninja's repo

* Cleanup oopsies

* Cargo UI adjustments

* Nuke lodash

* Minor fixes and cleanup

- Remove local Inferno package in favor of upstream Inferno
- Fix "initial" prop on AnimatedNumber
- Force fancy=0 for IE8
- Click-through dimmer

* Add a bat file for dummies

* podlauncher interface fix

* Update README, assert code dominance

* Clarify usage of event handlers in Inferno

* Document LabeledList.Divider

* Fukken grammar

* fixes cellular emporium readapt button not working

* fixes incorrect action on button in atmos control interface

* remove unneeded data from airlock electronics ui

* Set +x mode on bin/tgui

* Fix filename cases

- They were untracked by git on windows

* Ignore package lock, make batch more robust

- package-lock.json is very random and unreliable as fuck. Yarn was better.

* Build tgui-next in travis

* bruh

- fixes tgui error reporting

* logging cleanup + always log
2019-10-15 17:20:37 +02:00
py01
aef75f6cda removes skewium (#47056)
* removes skewium and rotatium

* Revert "removes skewium and rotatium"

This reverts commit 878fc4903b3b44dd96e021993368e9ce89918e4c.

* removes only skewium
2019-10-15 10:59:38 +02:00
Tony
e47915959d Adds portable air pump and portable scrubber crates to cargo (#46867)
* adds portable air pumps and portable scrubbers to cargo

* big scrubbers too
2019-10-15 10:47:19 +02: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
81Denton
059d9b1910 Fixes centcom supply pod launch messages (#47038) 2019-10-13 19:41:50 +02:00
kingofkosmos
dba1d2eb2d Fail-messages from notice-spans to warning-span. 2019-10-12 21:24:52 +03: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
moo
de13e122ed Merge pull request #46972 from willox/botany-bounties
chili and ice-chili botany bounties are no longer overridden by ghost chilis
2019-10-10 13:47:38 -04:00
nemvar
c38a7a3bb5 Removes a bunch of var/ in procs (#46946)
* Removes a bunch of /var in procs

* reset this

* Why wasn't this already?
2019-10-10 04:20:27 -07:00
Qustinnus
b11d0a6c13 fix (#46999) 2019-10-09 20:00:28 -04:00
William Wallace
481760675f chili and ice-chili botany bounties are no longer overriden by ghost chilis 2019-10-08 21:50:30 +01: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
kingofkosmos
71644568b5 Personal interaction messages to simple animals (#46744)
* Adds attacktext2 and friendly2 messages for personal "you" messages in combat.

* Adds response_help2, response_disarm2 and response_harm2 -messages for interacting with simple animals. Also removes unnecessary, already inherited, ones.

* Small extra: Adds personal messages for gun firing.

* Adds personal messages to grabs and fixes shoe stealing messages.

* Fixes open someone else's internals valve pronoun.

* Replaces response_help --> response_help_continuous, response_help2 --> response_help_simple etc. Also adds autodoc to simple_animal.dm variables.
2019-10-07 21:18:42 +02:00
Twaticus
70b68366e4 More Carpets & Tables (#46850)
Ports carpets from TauCetiStation
Original PR: TauCetiStation/TauCetiClassic#2989
Adds tables to match the carpets

Carpets Good. Tables Good.
Changelog

cl
imageadd: 8 new carpets and fancy tables
add: exotic carpet crate
/cl
2019-10-06 18:09:16 +13:00
AnturK
01c1a5a54a Fix paperplane manifest runtime (#46865)
Just some missing sanity. If outer object depended on something inside 
to exist. (Right now only paperplane)
2019-10-05 13:15:47 -07:00
Fikou
05f0c2c1f3 adds the GRILL (#46844)
* a

* GRILL GANG

* sipp

* sip

* seep

* grug

* FSAIUGANOHNHOE

* bru

* a

* finish him

* compilies ^w^

* WOOO

* holy crap

* woo

* a

* h

* woo

* woo

* woo

* awoo

* aa

* aw shet

* heck you floyd

* at ath

* awo

* we like compiling code

* awo

* coal mat

* awoo

* aasdga

* a

* nice

* awoo

* awwoooooooooooooooooooooooo

* awoo

* spaceport bars

* grill gang

* aw

* awooo

* yee

* aw

* flod

* awoo

* awoo

* yesyesyyes

* a

* awoo

* holy sht

* h

* awoo

* awo

* aaaaaaaaa

* awoooooooooo

* awoo

* aw man

* honk

* well boys we did it

* oh mama mia

* ok cobby flushed

* awoo

* removes fun

* yeep

* i just said something

* vruh obama

* ye

* awoo

* awooooooo
2019-10-05 13:40:40 -04:00
William Wallace
f1d2d40554 get_export_categories returns its result (#46816) 2019-10-02 12:18:07 +02:00
skoglol
a7b02fb6c7 Removes air mix tanks (#46480)
* Removes air mix tanks.

* and the maps.
2019-10-02 12:01:23 +02:00
Fikou
ec4280f597 fixes antag token vendor sprite and kinda fixes cargo exports text (#46616)
* ye

* oop
2019-09-20 02:07:30 -04:00
Fikou
730d96ad06 bunch of datum mats stuff mostly related to coins (#46289)
adamantine and mythril are now datum mats (mythril still admin only), adamantine has 1.5 strength buff to whatever is made out of it, mythril adds rpg loot elements to whatever is made out of it
you can now put plastic, adamantine and mythril in the autolathe and coin mint
you can now put titanium in coin mint
switches a bunch of stuff in cargo exports, including mythril and plastic being worth cash money
coin code has been changed to datum mats, the custom sprites have been lost except for antag token
2019-09-17 10:50:32 -04:00
James
4e10294706 Mining points are back (#46548)
* Mining points are back

* Adds back the shaft miner starter kit cargo pack
2019-09-17 07:48:25 +02:00
Krysonism
4514a98633 The gambling anticipation update. D6 resprite and more! (#46471)
About The Pull Request

This PR resprites the D6, adds two money bags and a bag of 5 d6'es to the bardrobe. Be on the look out for the expensive ebony dice.

I have also made code improvement by filling dice bags using PopulateContents() and giving the special dice their own loot spawner.
Why It's Good For The Game

I have recently in anticipation for the roulette update tried playing some simple dice games with my bar patrons to great success. I did however notice that the old d6 sprites were quite bad, so i decided it was time for a resprite,

I have also added money bags to the BarDrobe since those will be needed if more forms of gambling are added to prevent greytiders from stealing all your winnings.

DiceComparasion
EbonyDiceLarge
Changelog

cl
add: Money bags can now be obtained from the BarDrobe.
add: A bag of d6'es is now available in the BarDrone. May contain a rare die.
imageadd: New d6 base sprites and variant.
refactor: Improved the way the normal dice bags is populated.
/cl
2019-09-16 16:43:20 +12: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
moo
74ed605cd7 Cobbduceus Part 1/X: Category Twos, Base(d) Healers (#45749)
* 150 hours

* it compiles guys

* PERF

* meta conflictor

* oldcabin

* Revert "meta conflictor"

This reverts commit 812343ca615e5b00711786be4413ce3301cfcc90.

* oldmeta

* TAKE 5000

* NAME THIS

Also redoes Multiver/Palletta

* FRICK U FIZ

* NERF PERF

* comment cringe

* Checks for restraints/incapacitated for ichiyuri

* URIKA

Removes Healing-Scaling of Ichiyuri, Nerfs Healing of Aiuri.

* organ

* please upvote this

* maps...

* Gives Instabitaluri a Brand Name

Oh wow it's synthflesh 😆

* Update cat2_medicine_reagents.dm

* what kinda characters is Krys using
2019-08-22 17:30:16 -07:00
skoglol
8e6276d450 Adds UI dimension vars to machinery (#45959)
* Adds dimension var to machinery.

* cleaner

* newlines

* Cleanup
2019-08-22 00:33:10 -07:00
MMMiracles
5bf2bafdd8 Adds Capitalism Firing Pins (#45893)
* adds capitalism firing pin for late-stage capitalism

* purchase prompt so you can't bankrupt the captain with a rigged gun

* prompt spam check, cargo crates for pins, extra warning message for accepting payment but not having enough to pay out

* test stuff please ignore

* pay-per-shot system, alert instead of input, minor cleanup

* fuck off clown

* range check to prevent long-range purchasing
2019-08-19 22:56:06 -07:00
Tlaltecuhtli
0c37793bfa cargo request console pings supply radio when someone makes a new request (#45878)
* Update maps.txt

* 1

* 2

* Update console.dm
2019-08-13 16:51:49 -04:00
Fikou
d18c275aca bulletproof helmet add + art supply change (#45666)
Adds bulletproof helmets to cargo and completely changes artistic crates
2019-08-09 18:49:12 -07:00
skoglol
216a7ec316 Cargo console UI touchup (#45764)
About The Pull Request

Moves requests and cart below the cargo pack list, so you dont need to find the right button after everything you buy. Resized the cargo window, less airy. Added a toggle for buying privately, less buttons should improve performance somewhat.

Why It's Good For The Game
Less annoying UI.

Changelog

cl Skoglol
tweak: Cargo console UI touched up a bit. Requests and cart moved below the cargo packs for less button shuffling, buying privately is now a toggle, resized window slightly.

/cl
2019-08-09 13:15:02 +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
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
Rob Bailey
bfb6cf01bb Refactors shield wall generators (#45221)
* migrates the shield generator to the powered typepath

* map update

* fixes wire unsecuring weirdness

* this should go here actually

* minor reformatting + documentation
2019-07-19 08:05:57 +02:00
Gamer025
60ce468d92 Fixed supply shuttle safety warning (#45164)
The safety warning preventing players from reaching centcom did not include any mention of cyborgs or the AI which however still trigger the warning.
2019-07-15 20:01:41 -04:00
Bobbahbrown
e965731cf7 Fix scanning mutated seeds expending their value (#45158)
a little bit of dry run for all my thirsty gamers! 💦💦💦💦
2019-07-13 19:13:57 -07:00
Tlaltecuhtli
59c1d2d4a4 Fix cargo BZ price exploit (#45145)
Costs 4000, sells at 7496.83. Now costs 8000.
2019-07-13 15:33:12 -07:00