shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,313 Commits 5 Branches 0 Tags
695bbef4732cae21469cda4823edea3e2d83ca88
Commit Graph

1403 Commits

Author SHA1 Message Date
deathride58
695bbef473 makes spears require priming to explode on throw, makes it possible to rip embedded objects out instantly by pressing resist if the item is normal sized or larger (#7450) 2018-08-23 00:30:33 -07:00
deathride58
21064fb860 nerfs emp defibs by giving their disarm act a 1 second timer (#7483) 2018-08-23 00:24:27 -07:00
kevinz000
ccfa495a27 Update pneumaticCannon.dm 2018-08-17 16:02:01 -07:00
deathride58
4f36f3d263 Merge pull request #6945 from ElPresidentePoole/master 
Allows players to commit seppuku with any katana, adds SFX for seppuku
 2018-08-17 16:55:28 -04:00
deathride58
279ebaf27a Merge pull request #7429 from Citadel-Station-13/kevinz000-patch-9 
family heirloom toolboxes are now bulky items but take less stamina to swing, have 2 extra damage, as well as 20 extra damage to structures/objects
 2018-08-12 20:38:00 -04:00
Letter N
6f84c924e1 ser.lazy == true (#7453) 2018-08-12 17:37:36 -07:00
kevinz000
0ee8542677 Update toolbox.dm 2018-08-01 21:27:43 -07:00
kevinz000
2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58
f1739cb482 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
 2018-07-20 03:40:39 -07:00
deathride58
00128fe87e nerfs gas tank ruptures by reducing the effective pressure of a gas tank rupture from ^4 to ^3 (#7373) 2018-07-18 15:18:23 -07:00
Bear
88fb190bed display images modularizing 2018-07-10 18:05:16 -04:00
Bear
4f48bc2dd5 pAI screen displays 2018-07-10 07:37:16 -04:00
deathride58
6a5087877b Merge pull request #7129 from PolymorphBlue/vTecControl 
Modifies the vTec cyborg upgrade to be toggleable between off/half/full
 2018-07-09 00:26:23 -04:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
f986f9c9f2 makes it compile. should work. hopefully 2018-07-02 15:35:11 -04:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
LetterJay
42c322ca2c Merge pull request #7281 from Citadel-Station-13/upstream-merge-38789 
[MIRROR] Cleans up leftover telesci teleporter code
 2018-07-01 09:39:08 -05:00
LetterJay
2b9aca8143 Merge pull request #7279 from Citadel-Station-13/upstream-merge-38795 
[MIRROR] [s] Fixes PDA ID teleporting
 2018-07-01 09:37:45 -05:00
LetterJay
be23ad6a06 Merge pull request #7277 from Citadel-Station-13/upstream-merge-38656 
[MIRROR] Makes the deconstructable TEG working
 2018-07-01 09:36:57 -05:00
LetterJay
de6ae20f87 Merge pull request #7254 from Citadel-Station-13/upstream-merge-38644 
[MIRROR] Port AI static to vis_contents
 2018-07-01 09:29:10 -05:00
ShizCalev
452b34caa2 Cleans up leftover telesci teleporter code (#38789) 2018-07-01 05:43:43 -05:00
ShizCalev
b523a59ae5 Fixes PDA ID teleporting (#38795) 2018-07-01 05:42:40 -05:00
Dennok
58f634db63 deconstructable-TEG (#38656) 
Make TEG deconstructable.
 2018-07-01 05:41:53 -05:00
deathride58
e2234a7fc4 Merge pull request #7149 from Citadel-Station-13/upstream-merge-30862 
Flashbangs no longer hurt blobs
 2018-06-26 14:07:53 -04:00
Jordan Brown
a14bc0615d Merge pull request #38644 from AutomaticFrenzy/patch/cameranet 
Port AI static to vis_contents
 2018-06-25 20:23:32 -05:00
LetterJay
acd10b02cf Merge pull request #7195 from Citadel-Station-13/upstream-merge-38574 
[MIRROR] Global component signals
 2018-06-24 18:20:17 -05:00
LetterJay
72bc5121bd Merge pull request #7233 from Citadel-Station-13/upstream-merge-38653 
[MIRROR] Ports more things to Initialize
 2018-06-24 18:12:40 -05:00
LetterJay
269a375927 Merge pull request #7221 from Citadel-Station-13/upstream-merge-38321 
[MIRROR] [READY] better contraband crates
 2018-06-24 15:33:05 -05:00
LetterJay
057350d7dc Merge pull request #7220 from Citadel-Station-13/upstream-merge-38093 
[MIRROR] Fixes and adds blast cannons to traitor science uplink items
 2018-06-24 15:32:49 -05:00
LetterJay
0a28cbdfc4 Merge pull request #7217 from Citadel-Station-13/upstream-merge-38570 
[MIRROR] Fixes gulag stacker not giving points after RPG loot event
 2018-06-24 15:16:35 -05:00
LetterJay
ce9d797ac5 Merge pull request #7190 from Citadel-Station-13/upstream-merge-38577 
[MIRROR] PDA can be ctrl-clicked to remove the item in its pen slot
 2018-06-24 15:07:54 -05:00
Jordan Brown
a73bfd0913 Ports more things to Initialize (#38653) 2018-06-24 05:17:15 -05:00
Tlaltecuhtli
01eb1bc7fe [READY] better contraband crates (#38321) 
feature: NT reports that the local contraband market has expanded, experts say that the Syndicate is involved.
 2018-06-21 18:52:15 -05:00
kevinz000
561c2179f8 Fixes and adds blast cannons to traitor science uplink items (#38093) 
rscadd: Blast cannons have been fixed and are now available for purchase by traitorous scientists for a low low price of 14TC.
rscadd: Blast cannons take the explosive power of a TTV bomb and ejects a linear projectile that will apply what the bomb would do to a certain tile at that distance to that tile. However, this will not cause breaches, or gib mobs, unless the gods (admins) so will it.
experimental: Blast cannons do not respect maxcap. (Unless the admins so will it.)
 2018-06-21 18:38:46 -05:00
YPOQ
a6cfd22b79 Fixes gulag stacker not giving points after RPG loot event (#38570) 
* Fixes gulag stacker not giving points after RPG loot event

* Moves point values to type vars

* cleanup
 2018-06-21 16:30:39 -05:00
Jordan Brown
c11557d23d Global component signals 2018-06-19 17:18:34 -05:00
Irafas
75335cb30b PDA can be ctrl-clicked to remove the item in its pen slot (#38577) 
* Makes pens ez to remove from pda

Players can now ctrl click on the PDA to remove the pen without having to remove the ID first.

* added instructions when examined.

Like how it tells the user they can use alt-click to remove contents, it now says they can use ctrl-click to remove items from the pen slot.

* PDA can now be dragged without dropping the pen.

When ctrl-clicked it now checks to see if the PDA is on a turf and will only output the pen if its not.

* quick change to examine text.

* comma

* Improved the examine
 2018-06-19 09:49:36 -05:00
JStheguy
02744c59a5 [READY] Helps data disks stop being unemployed (#38319) 
* data cards actually have a function now

* Adds data cards to the IC printer for real rea

* more cards, less shitty code

* how the fuck did I miss that

adds a missing ..()

* wait wrong use of ..() fuck
 2018-06-19 09:23:33 -05:00
CitadelStationBot
db25067491 adds missing /'s at the starts of some obj instances (#7169) 2018-06-18 11:53:33 -07:00
LetterJay
fb53413ded Merge pull request #7160 from Citadel-Station-13/upstream-merge-38270 
[MIRROR] [READY] advanced foam extinguisers [READY]
 2018-06-18 12:28:42 -05:00
LetterJay
6d74717b39 Merge pull request #7158 from Citadel-Station-13/upstream-merge-38533 
[MIRROR] Adds dance machine, drink dispensers, flavor to beach bum ruin
 2018-06-18 12:27:45 -05:00
Tlaltecuhtli
1a42719d80 Advanced foam extinguisers (#38270) 
* mining voucher tweak

* will it blend

* d

* s

* ss

* advanced fire extinuishers

* remove trash

* garbage cleaning

* lets see

* t

* whatever

* test if using a var compiles

* adds it to cargo

* adds to atmos + ce

* should fix the sprites

* lowers the volume of the foam tank

* gonna load the icon for this soon

* woops

* foam icon

* ddd

* it works

* boo

* r34ijfirgv5
 2018-06-18 09:38:07 -05:00
81Denton
241d0c7a9a Adds dance machine, drink dispensers, flavor to beach bum ruin (#38533) 
* shit was SO cash

* correct dance machine subtype

* moves defines from map file to corpse.dm

* improves bartender flavor text

* adds special shadycigs for beach ruin, adds shower, moves bartender sleeper to backroom
 2018-06-18 09:37:48 -05:00
kevinz000
b806ee92f3 Merge branch 'master' into upstream-merge-30862 2018-06-17 20:04:06 -07:00
kevinz000
6a8f029e30 Update flashbang.dm 2018-06-17 20:02:49 -07:00
Poly
7fd0e7ced6 Adds requested comment 2018-06-17 06:50:43 -07:00
Jordan Brown
9acc97dabe Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders 
Fix being able to pull mirage borders, others
 2018-06-16 15:50:27 -05:00
Poly
212d971c03 Modifies the vTec cyborg upgrade to be toggleable between off/half-boost/full-boost 
Adds a set of chevron icons to icons/mob/actions.dmi to show this - provided by Toriate
 2018-06-16 11:40:46 -07:00
CitadelStationBot
46b2bc0c63 [MIRROR] [s]Add pacifism checks for screwdriver/bottle attacks (#7092) 
* Add pacifism check for screwdriver/bottle attacks (#38416)

* [s]Add pacifism checks for screwdriver/bottle attacks
 2018-06-15 02:42:34 -07:00
LetterJay
14f7ca0449 Merge pull request #7072 from Citadel-Station-13/upstream-merge-38376 
[MIRROR] [s] Fix lockboxes not actually being locked
 2018-06-12 08:08:15 -05:00