Commit Graph

28886 Commits

Author SHA1 Message Date
AnturK 07b7c248ff Merge pull request #43969 from 4dplanner/healthhud
Checks for null not 0 in healthhud
2019-05-16 14:52:57 +02:00
Strommer Kilian ebfec0c044 typo fix (#43968) 2019-05-16 14:50:36 +02:00
vuonojenmustaturska 1009d008de mistakes were made (#43957) 2019-05-16 14:42:19 +02:00
vuonojenmustaturska c656547df0 wtf 2019-05-16 00:59:41 +03:00
pireamaineach 0a2d3434ac Fixes me dumb big mistake. (#43934) 2019-05-15 16:54:54 +02:00
vuonojenmustaturska 9dc9028b06 henk (#43953) 2019-05-15 16:53:04 +02:00
Garen Crownguard 6c29e437cf fixes infinitely strained muscles 2019-05-15 01:33:12 -05:00
vuonojenmustaturska 251bf9b97f Update LINDA_turf_tile.dm (#43962) 2019-05-14 23:34:10 -04:00
nemvar 093da2d734 Bumper 2019-05-14 22:56:00 +02:00
AnturK e1bea6d613 Fixes ed209 not shooting anything (#43923)
The net projectiles are completely useless and more likely to teleport the
ed than the target, but i'll leave changing these for another PR
2019-05-14 12:48:36 -07:00
4dplanner 9ea4831046 Fixes glass golem pierce 2019-05-14 19:57:23 +01:00
jegub 27c0b5bc32 Resets the lastproduce variable on plant death/removal (#43886)
* Changes maturation and production speed of grasses to avoid failure to reach harvest.

* Resets lastproduce var on plant death/removal
2019-05-14 13:19:52 -04:00
JJRcop 149d73c71f Clean up VR sleeper from techweb (#43954) 2019-05-14 13:18:39 -04:00
4dplanner 26160a8c26 Checks for null not 0 2019-05-14 17:11:01 +01:00
tralezab 74efd6efa5 confusion will be my epitaph 2019-05-14 09:00:44 -07:00
tralezab 169b66f43b Merge branch 'master' into feels-like-i-didn't-even-try 2019-05-13 18:58:08 -07:00
oranges 7e9ddc2fe4 Merge pull request #43893 from Flatgub/RCL_GUI_candidate
Implements RCL radial wiring menu
2019-05-14 11:15:57 +12:00
oranges 78dbfef047 Merge pull request #43959 from vuonojenmustaturska/blobfix
Adds back the missing reagent to synchronous mesh
2019-05-14 09:24:03 +12:00
WJohn 85cfd2318b New Boxstation mining shuttle (#43920)
* Larger mining shuttle with power connection when docked with the station. Only in use on boxstation right now.

* Whoops, forgot to add the actual shuttle!

* Fixes cable connections across shuttles

* Unlocks the APC in the mining shuttle.
2019-05-13 23:08:22 +02:00
vuonojenmustaturska 640649d272 Update synchronous_mesh.dm 2019-05-14 00:07:09 +03:00
oranges 7c0e23a913 Merge pull request #43947 from penterwast/bsa-logging
Adds Proper BSA Logging
2019-05-14 08:48:30 +12:00
Krysonism 9dd94322ef Adds 10 new drinks, some food reagents and goofconomizes champagne (#43825)
* Adds 10 new drinks + related stuff.

* Update code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

Co-Authored-By: Krysonism <49783092+Krysonism@users.noreply.github.com>

* Update alcohol_reagents.dm

* Fixes the pwr game soda I messed up

* gives champagne the intended price

* Tries to fix the atrocious spelling and grammar

* Adds period

* Tries to appease cobby

Removes Mandela(RIP)
Makes misc changes cobby wanted to the best of my limited ability.

* Taking "catsip" out behind the shed

The drink catsip has been axed. Rest in peace.

* Reworks turbo to be more unique

Turbo no longer boosts your speed, but instead restores stamina based on how drunk you are. Enjoy responsibly, or get shitfaced and fight with security.
2019-05-13 16:46:52 -04:00
vuonojenmustaturska 3bc1e1137d Makes the broken bottle outline icon reference a static var (#43943) 2019-05-13 16:43:35 -04:00
vuonojenmustaturska bc3057b7e3 reorganize blob files (#43946) 2019-05-13 21:19:29 +02:00
anconfuzedrock bd37a5d9c9 [Ready I guess] adds saline drip (#43773)
* adds saline drip

* moves the stuff all nice-like

* makes description less ugly

* does src properly
2019-05-13 10:27:45 -04:00
Ty-the-Smonk dcdac119ac Self sustaining fix (#43917)
About The Pull Request

Fixes #42987
Why It's Good For The Game

Fixes a 2 month old bug for a useful crossbreed type. You can now interact with self sustaining extracts
Changelog

cl
Fix: You can now interact with self sustaining crossbreeds
/cl
2019-05-13 10:45:47 +12:00
oranges e34274c6ec Merge pull request #43904 from kriskog/surgery
Fixes some repeatable surgery bugs
2019-05-13 10:45:02 +12:00
tralezab aae8e2fb99 fixes brain traumas not being cured by nanites sometimes (#43902)
* fixes brain traumas not being cured by nanites sometimes

* yeap

* okay got it for real this time

* just kidding u stupid bitch here's another commit
2019-05-13 10:44:42 +12:00
oranges a3e606bcdb Merge pull request #43912 from Mickyan/fridge_fix
Fixes disk toasters turning invisible
2019-05-13 10:41:19 +12:00
penterwast a123106563 Add BSA logging 2019-05-12 18:24:51 -04:00
vuonojenmustaturska e2104ed3c8 Blob refactor (#43872)
* blob refactor

* blobtype -> blobstrain

* fixes, chemical -> strain

* only /mob/living experience Life, blobs and other cameras can process if they need to

also other fixes

* call_life goes out

* ispath thing
2019-05-12 23:59:36 +02:00
Strommer Kilian 5b825255a1 add 3d orange for real this time (#43896) 2019-05-12 15:21:14 -04:00
Farquaar 4d37b82fbd Fixed rastacap icon_state (#43938) 2019-05-12 15:16:15 -04:00
vuonojenmustaturska 94c42e3a45 Removes VR (#43832)
* dunk

* this too
2019-05-12 13:33:06 -04:00
tralezab e50ef24030 a lot of the fixes minus ship spawning
fix names
2019-05-11 23:21:55 -07:00
tralezab c9a8b77b47 Merge branch 'master' of https://github.com/tgstation/tgstation into feels-like-i-didn't-even-try 2019-05-11 19:40:04 -07:00
tralezab eaf3ccdfac testing commit, code improvements 2019-05-11 19:36:48 -07:00
AnturK 3a3b036bbd Fixes additional ai's spawning. (#43915)
* Fixes ai/cyborg job passing through human preview

* Also in the future.

* bleh
2019-05-12 10:59:54 +12:00
AnturK 11376c3c7b Dumbfire changes (#43843)
* Dumbfire changes

* Unifies dumbfire and projectile.

* Also fixes this while i'm at it.
2019-05-12 10:53:20 +12:00
vuonojenmustaturska f5fdf4fa65 Makes vending machines use spritesheets over artisanal handwritten getflaticon memes (#43914)
About The Pull Request

Pretty much what it says on the tin.

Oh yeah I also removed the string concatenation nonsense in favor of multiline strings and a list.
Why It's Good For The Game

Removes many getFlatIcon calls during the round, also some runtimes from ephemeral items being created and immediately deleted when the vending machines are used.
Changelog

cl Naksu
tweak: vending machines now use spritesheets
/cl
2019-05-12 10:51:03 +12:00
oranges ff6b642b16 Merge pull request #43913 from vuonojenmustaturska/getflaticoncaust
Removes some getflaticon calls from things that don't draw browser interfaces
2019-05-12 10:50:26 +12:00
Tlaltecuhtli 1b374c4564 bottles and soda cans now break when hit by a bullet (#43768)
cl
add: hitting a bottle or a soda can with a bullet will make them break
/cl

now u can shoot cans n stuff in the courtyard
2019-05-12 10:47:54 +12:00
Kierany9 bea552cf2f Medullary Failure now has a maximum range (#43837)
* removes queen

* Update hivemind.dm
2019-05-11 18:29:19 +02:00
vuonojenmustaturska f6b7ad5cb2 no waiting for lateloaders (#43834) 2019-05-11 18:28:22 +02:00
RaveRadbury 84a0a262ec [READY] Adds follower hoodies to crafting menu (#43810)
* Follower hoodies can be crafted by those wearing follower hoodies

* Adds bible tool requirement to follower hoodie construction
2019-05-11 18:19:47 +02:00
Tetr4 c44f424fe2 Adds input() to remote signaller (#43799)
* more buttons

* thetin

* fixes freq format bullshit

* after-input check

* yuh
2019-05-11 18:10:17 +02:00
Rob Bailey 106cd26fc0 Small audio fixes (#43883)
* pure file fixes

* beep pitch fix

* duump eet
2019-05-11 18:09:00 +02:00
oranges 59d32657ab Merge pull request #43859 from vuonojenmustaturska/summonguns
Fixes a summon guns runtime
2019-05-11 09:43:21 +12:00
vuonojenmustaturska 4daeacccc4 actually these aren't mutated 2019-05-10 22:54:58 +03:00
vuonojenmustaturska 9d00b8bc1c ree 2019-05-10 22:49:04 +03:00