Commit Graph

8109 Commits

Author SHA1 Message Date
Acer202
f4320af808 Advanced space hitch-hiking apparatus (#47679)
About The Pull Request

Mura, noticing a disturbing lack of banjos in space, decided to start making some!
Why It's Good For The Game

-Adds a very nice banjo to the musician's arsenal, which hopefully may offset the ear-destruction that is the violin and accordion.
-Play rag on something that sounds nice.
-Space redneck shenanigans.
-Murder people with a banjo.
Changelog

cl
add: Mura space banjos are now in stock at your local NT instrument supplier! Start picking today!
/cl
2019-11-14 09:30:26 +13:00
spookydonut
dd6fa5eded More spawn/sleep removals (#47634)
* remove more spawns

* more

* more

* varsets

* oops

* unfuck this
2019-11-13 03:07:59 -08:00
skoglol
6d1ed37247 Genetics scanner linking feedback (#47698) 2019-11-13 02:56:22 -08:00
skoglol
f17265b267 Removes plumbing from the RPD (#47713)
* baby steps

* Removed plumbing from RPD
2019-11-13 02:54:28 -08:00
Emmett Gaines
041322f222 Cleans up some destroy procs related to remote_materials (#47601) 2019-11-08 22:15:50 +01:00
Rob Bailey
041cde553e fix crafting ui breaking when knowing desserts (#47615) 2019-11-07 10:42:30 -05:00
Aleksej Komarov
8cf0a9db2c tgui-next: Radio, ORM, Solar Tracker (#47537)
* Radio interface

* Ore redemption machine interface

* Remove candystripe because it looks like shit

* Solar tracker interface

* Add more channels, add full color support to Box

* Cleanup README

* conversion guide draft 1

* Update documentation

* Implement an Input component, update component reference
2019-11-05 02:26:57 -08:00
skoglol
9c374bab73 Dice bags spawn the special die in the bag (#47561)
* Makes special die spawn in the bag

* No weighted pick
2019-11-05 01:22:17 -08:00
spookydonut
2591ce17a6 Travis EOF newline detection v3 (#47539)
* scream

* aaa

* aaa

* new one
2019-11-04 19:16:50 -08:00
skoglol
74000a51cb Examine fixes (#47562) 2019-11-04 19:11:30 -08:00
Firecage
87b1f56034 Re-organizes survival box code to be less horrendously ugly. (#47504)
* Adds clown and mime masks to their respective survival boxes, and re-organizes survival box code.

* Removes clown and mime masks from survival kits.
2019-11-03 01:49:35 -08:00
skoglol
43a41e35a7 Janitors start with holosigns again (#47513)
* Janitor start with holosign instead of barrier, barrier now only blocks carbons.

* And unconscious for the other ones too
2019-11-03 01:42:17 -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
ATH1909
fe3d6d42a2 Makes resurrecting and killing intellicarded AIs less painful (#47362)
* Update airestorer.dm

* Update aifixer.dm

* Update aicard.dm

* Update airestorer.dm

* Update aifixer.dm
2019-10-31 00:20:17 -07:00
ArcaneMusic
f0f6b6e09b Adds plastic floors, floor tiles. (#47424)
* Adds plastic floors, floor tiles.

* Plastic tile version 2, Bluer, looks like a single sheet

* Plastic floors take 3, makes plastic floors weaker under heat than most other floortypes

* Fixes the ONE PIXEL, adds datum mat to turf for later use.

* Rebases floors, uses new file structure.

* Platic isn't a word
2019-10-30 19:29:24 -07:00
Anonmare
fd08e36069 Makes the service cyborg competent at bartending (#47385)
* service borg gang

* Update borghydro.dm

* Update robot_modules.dm

* Wow I can't believe it took me 12 hours to find

* Update robot_modules.dm
2019-10-30 16:29:33 -07:00
Rohesie
9dd28d5180 ID fix (#47387) 2019-10-30 16:17:55 -07:00
Arkatos1
4ef7301a63 Singularity hammer fix (#47438) 2019-10-30 02:02:45 -07:00
kingofkosmos
8768b6b3b5 Removes unused & undefined spans (#47436)
* Removes all instances of 'caution', 'error' and 'notify'.

* Removes span classes which were either not used at all or were used very infrequently.
2019-10-30 02:00:11 -07:00
spessbandit
42766641f0 Buffs the mime. (Adds 30 new emojis, all emojis visible within PDA.) (#47420)
* buffs mime

* alphabetizes emoji list

* antur's redesign

* make that 24

* did I say 24 fuck that we're going 30
2019-10-30 01:55:03 -07:00
Couls
8c2a8680d6 Update shields.dm (#47458) 2019-10-30 01:51:53 -07:00
carlarctg
b49d3bb4ac hello (#47357) 2019-10-30 01:47:25 -07:00
Firecage
34427d9872 Some bags and belts can hold more stuff. (#47318) 2019-10-28 17:07:58 -04:00
nemvar
d4ea42c950 Xeno impreg now gets stopped by stasis (#47307)
* Xeno impreg now gets stopped by stasis

* holy fuck why does my editor do this?

* review change

* ree
2019-10-27 20:21:20 +01:00
carlarctg
bfc9c6ba81 Fixes candy cigarettes (#47332)
About The Pull Request

haha am stoopido :)
i fucked up with candy cigarettes like an idiot and didn't test anything
candy cigs now look like candy cigs and dont ahve broken sprites
Why It's Good For The Game

bug xies good
Changelog

cl
fix: candy cigarettes don't have broken sprites anymore
/cl
2019-10-26 21:07:09 +13:00
Neo
89299dd989 fixes (#47355) 2019-10-25 16:42:32 -07:00
genessee596
4250e1bd9e Adds generic gas tanks, constructable at the Autolathe (#47321)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload
2019-10-25 02:43:50 -07:00
Arkatos1
dabba37db2 Chameleon sprite fixes (#47322) 2019-10-25 02:36:39 -07:00
skoglol
2dd01611fc Some input() sorting fixes (#47354)
* dynamic gamemodes

* Some input fixes
2019-10-25 03:15:26 -04:00
Cenrus
7eaade4d7f Fix abductor typos (#47350)
Fixes a small typo in the abductor console where the chemical dispenser 
was called "Reagent Synthetizer" instead of "Reagent Synthesizer".
2019-10-23 20:39:03 -07:00
Krysonism
678ff60bbd You've got to go back. (#47269) 2019-10-23 20:41:57 +02:00
tralezab
fcf2dbfa02 [READY] Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook (#47177)
* relic file

* Revert "Merge branch 'master' of https://github.com/tralezab/tgstation"

This reverts commit 826916d87b421dbb0ebcfce7fad96e456b6d3674, reversing
changes made to a0f476d874.

* mime pda

* hey maybe it works

* some steps forward

* IT WORKS HAHAHA YAAAAAAAAAAAAAAAAA

* logged properly in everything
2019-10-22 20:19:21 -07:00
81Denton
6b1161ecd9 Cleans up revive related procs (#47025)
* Cleans up revive related procs

* h

* fuck

* Fixes proc arguments

* Further fixes

* Unfucks line endings
2019-10-22 15:16:13 -07:00
genessee596
9cb5db5ba3 Removes all budget cards except for cargo card, gives cargo small steady income -- [ACTUALLY WORKS THIS TIME] (#47256)
Exact same as my earlier PR, but it actually works - [https://github.com//pull/47212]
Changelog

cl
del: Removed all departmental budget cards except for cargo card
tweak: Cargo now gets 500 credits per paycheck
balance: Cargo can't amass infinite money from other departments
/cl
2019-10-23 09:13:06 +13:00
skoglol
938e66f62c Adds sorting to most input() lists (#47117)
* Adds sorting to most input() lists.

* Sorted some global lists, added more input sorting

* Should now use correct sort everywhere.

* compiles

* Last fixes.
2019-10-22 04:28:42 -07:00
Jordie
de85502ef9 Merge pull request #47199 from ninjanomnom/mom-says-update-your-icon
Makes an update_overlays() proc to manage overlays added by update_icon()
2019-10-21 21:12:51 +11:00
carlarctg
fe65761c93 Candy cigarettes! + cig tweaks (#47143)
* Oh dude we got a fuckin coffee cheetos chickennnnnnnnnnnnn

* Update mask.dmi
2019-10-21 13:20:45 +11:00
die
dd1437a3c4 Merge remote-tracking branch 'upstream/master' into oranges-no 2019-10-20 16:48:25 -03:00
Krysonism
59a0440acf Da white kit nerf update: sutures and regen mesh. (#47092)
* Base

* epic

* bandaid begone

* Documentation

* Bugmash

* Replaces bruise packs and ointment in on maps.

* Fixes for testmerge

* new line

* Dirty web

* Nasty webedit

* med suture is now a chemical recipe, adds cellulose reagent
2019-10-20 13:18:42 -04:00
81Denton
f5bd6a381d Merge pull request #47052 from kingofkosmos/misc_span_fixes1
Misc span fixes
2019-10-20 18:46:54 +02:00
81Denton
49589a9dee Merge pull request #46933 from Krysonism/Somethingforthekids
[READY]Da food update. Donuts! New foods! Nuggbox! Bowl resprite.
2019-10-20 14:55:35 +02:00
81Denton
1a0428f031 Fixes cult space bases (again) (#47041)
* Fixes cult space bases (again)

* h

* Fixes duplicate definition

* Lets cultists draw runes at the Lavaland cult altar ruin

* Adds CULT_PERMITTED_1 flag to check if cultists can summon/buld structures here

* h
2019-10-20 14:47:14 +02:00
Krysonism
c71d3a45d7 Update code/game/objects/items/storage/fancy.dm
Co-Authored-By: 81Denton <32391752+81Denton@users.noreply.github.com>
2019-10-20 14:35:58 +02:00
Krysonism
52cccbeae8 Update code/game/objects/items/stacks/sheets/sheet_types.dm
Co-Authored-By: 81Denton <32391752+81Denton@users.noreply.github.com>
2019-10-20 14:35:15 +02:00
81Denton
85ee636d41 Merge pull request #47198 from kingofkosmos/healthanalyzer_ceilingfix
Makes the health analyzer round the damage values up
2019-10-20 14:18:46 +02:00
DeAndre
a9b1ada28c Merge branch 'master' into Somethingforthekids 2019-10-20 13:26:13 +02:00
ArcaneMusic
e8160371a7 Adds the Cleric's Den ruin, and Datum Maces. (#46915)
* REWROTE EVERYTHING

* And these too

* Mapmerger as usual

* Qust changed some datum mat stuff, fixed

* Updated the rune sprite to be in-line with blood cult style runes.

* Uses a less degenerate sprite for the rune
2019-10-20 00:24:58 -04:00
Tony
2f8ef2f725 fixes not being able to access medical first aid kits inside a bag (#47155) 2019-10-19 21:42:17 -04:00
kingofkosmos
56b8461580 Fixes. 2019-10-19 22:17:50 +03:00
spookydonut
4e8ff18b07 Fix Travis grep script to use PCRE to actually match things (#47065)
Several of the greps were missing the `-P` switch which caused them to 
fail to match things. The EOL grep also wasn't working right so I 
replaced it with the one I added to TGMC.
2019-10-19 10:21:05 -07:00