Upstream fix mirror spree (#7362)

* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable

* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms

* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink

* tgstation/tgstation#38988 - Fixes blob victory.

* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button

needs tgui recompile

* tgstation/tgstation#38994 - Fix timer bug

* TGUI recompile

* tgstation/tgstation#39035 - Fixes navigation computers.

* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime

* tgstation/tgstation#39044 - Fixes burgers icons

* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations

* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero

* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo

* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
This commit is contained in:
deathride58
2018-07-20 06:40:39 -04:00
committed by kevinz000
parent c82e341278
commit f1739cb482
28 changed files with 172 additions and 57 deletions
+3 -3
View File
@@ -196,7 +196,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/dangerous/smg
name = "C-20r Submachine Gun"
desc = "A fully-loaded Scarborough Arms bullpup submachine gun. The C-20r fires .45 rounds with a \
20-round magazine and is compatible with suppressors."
24-round magazine and is compatible with suppressors."
item = /obj/item/gun/ballistic/automatic/c20r
cost = 10
surplus = 40
@@ -496,7 +496,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/ammo/smg
name = ".45 SMG Magazine"
desc = "An additional 20-round .45 magazine suitable for use with the C-20r submachine gun. \
desc = "An additional 24-round .45 magazine suitable for use with the C-20r submachine gun. \
These bullets pack a lot of punch that can knock most targets down, but do limited overall damage."
item = /obj/item/ammo_box/magazine/smgm45
cost = 3
@@ -1134,7 +1134,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
surplus = 20
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/device_tools/shield
/datum/uplink_item/device_tools/bananashield
name = "Bananium Energy Shield"
desc = "A clown's most powerful defensive weapon, this personal shield provides near immunity to ranged energy attacks \
by bouncing them back at the ones who fired them. It can also be thrown to bounce off of people, slipping them, \