shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,212 Commits 5 Branches 0 Tags
438daa7acffbb34bc26db4485a8d2c81efcb31ce
Commit Graph

1239 Commits

Author SHA1 Message Date
deathride58
5faf02a4b2 Merge pull request #7419 from Citadel-Station-13/kevinz000-patch-1 
Update shuttles.dm
 2018-08-04 00:05:33 -04:00
deathride58
42083d7206 Removes combat rework training wheels, and nerfs myself by increasing the minimum stamloss required to throw a knockout punch with boxing gloves (#7405) 2018-08-03 19:29:44 -07:00
kevinz000
8b7fa2396b Update shuttles.dm 2018-07-29 17:04:55 -07:00
deathride58
d0cb979b0a Experimental - reduces space ruin z-level count to 1 (#7359) 2018-07-20 03:42:30 -07:00
deathride58
fea27b5613 Adds citadel snowflake features as UE blocks (#7372) 
* adds mutcolor, mutant parts, and taur parts as proper UI blocks

* i didnt fucking ctrl+s
 2018-07-20 03:42:11 -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
4f5eb02cca Merge pull request #7338 from Citadel-Station-13/upstream-merge-38649 
[MIRROR] Converts antimagic from GetComponent to a signal
 2018-07-10 01:59:14 -04:00
AnturK
cc1070c7db Cleans up other components destroys (#38930) 
* wearertargeting destroy

* Why did these variables even existed.

* ....
 2018-07-06 11:39:42 -05:00
deathride58
b3c28c36fa Merge branch 'master' into upstream-merge-38649 2018-07-06 01:34:12 -04:00
Emmett Gaines
c8f5791557 Converts antimagic from GetComponent to a signal 2018-07-05 03:26:34 -05:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
ac6fddcfb3 Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync 2018-07-05 00:17:44 -04:00
CitadelStationBot
06d08c67c3 [MIRROR] Makes tear in the fabric of reality inaccessible until a boh bomb is detonated (#7327) 
* Makes tear in the fabric of reality inaccessible until a boh bomb is detonated (#38852)

* a commit message

* reviews addressed?

* Makes tear in the fabric of reality inaccessible until a boh bomb is detonated
 2018-07-04 18:38:53 -07:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
LetterJay
2303e23f2c Merge pull request #7278 from Citadel-Station-13/upstream-merge-38776 
[MIRROR] Potentially fixes monkey fever runtiming on infection
 2018-07-01 09:37:24 -05:00
XDTM
1a56d8243e Potentially fixes monkey fever runtiming on infection (#38776) 2018-07-01 05:42:07 -05:00
kevinz000
8b1917f149 Update bag_of_holding.dm 2018-06-27 01:38:36 -07:00
CitadelStationBot
e244438443 [MIRROR] Prevents tourettes from stacking (#7253) 
* fixes tourettes being cancer (#38682)

Prevents tourettes from stacking

* Prevents tourettes from stacking
 2018-06-25 18:21:17 -07:00
LetterJay
d79b85d719 trims a few issues during mirror merges 2018-06-24 18:42:24 -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
CitadelStationBot
386bc528ea [MIRROR] Add logging to teleport and the teleporter destination setting (#7225) 
* Add logging to teleport and the teleporter destination setting (#38645)

Helps with some admin issues

* Add logging to teleport and the teleporter destination setting
 2018-06-22 00:34:41 -07:00
Jordan Brown
c11557d23d Global component signals 2018-06-19 17:18:34 -05:00
CitadelStationBot
03a22ca16d [MIRROR] Transit space refactor (#7130) 
* Transit space refactor

* Update bitfields.dm
 2018-06-18 11:51:02 -07:00
LetterJay
119fb6abf6 Merge pull request #7159 from Citadel-Station-13/upstream-merge-38542 
[MIRROR] Some minor cleanup to RegisterSignal
 2018-06-18 12:28:11 -05:00
LetterJay
29ae18fb1a Merge pull request #7157 from Citadel-Station-13/upstream-merge-38461 
[MIRROR] Fixes the Blob being banished to the shadow realm
 2018-06-18 12:23:03 -05:00
LetterJay
c58dbc1110 Merge pull request #7138 from Citadel-Station-13/upstream-merge-38476 
[MIRROR] [s] Fix launchpads creating way too many sparks
 2018-06-18 10:09:42 -05:00
LetterJay
c40a2e698d Merge pull request #7137 from Citadel-Station-13/upstream-merge-38496 
[MIRROR] Fix being able to pull mirage borders, others
 2018-06-18 10:09:20 -05:00
Jordan Brown
548d498a5e Merge pull request #38542 from ninjanomnom/do-you-have-a-callback-license 
Some minor cleanup to RegisterSignal
 2018-06-18 09:37:57 -05:00
CitrusGender
ba6c5324f0 Fixes the Blob being banished to the shadow realm (#38461) 
* blob now respawns like nuke disk if off z-level

* can't do it, sorry nak

* space

* muh codebaby

* Revert "CitrusGender my friend, don't you start away uneasy"
 2018-06-18 09:37:35 -05:00
LetterJay
c00f4f04d1 Merge pull request #7116 from Citadel-Station-13/upstream-merge-38489 
[MIRROR] Some minor pubby shuttle tweaks
 2018-06-16 16:16:36 -05:00
Jordan Brown
e95851c8f6 Merge pull request #38476 from AutomaticFrenzy/patch/sparks 
[s] Fix launchpads creating way too many sparks
 2018-06-16 15:53:42 -05: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
Dax Dupont
e5b95cfcdd Some minor pubby shuttle tweaks (#38489) 
* Some minor pubby shuttle tweaks

* no step

* Good idea denton

* thanks guys
 2018-06-16 06:17:57 -05:00
Jordan Brown
8f2283c20e Adds some signal helpers (#38494) 2018-06-16 06:17:26 -05:00
CitadelStationBot
f9d5987993 [MIRROR] [s]Diseases lose scan invisibility if their stealth drops below the threshold (#7082) 
* Merge pull request #38415 from XDTM/master_of_disguise

[s]Diseases lose scan invisibility if their stealth drops below the threshold

* [s]Diseases lose scan invisibility if their stealth drops below the threshold
 2018-06-15 02:47:11 -07:00
CitadelStationBot
727b1a1b14 [MIRROR] Fixes clothes getting damaged twice in explosions. (#7097) 
* Fixes clothes getting damaged twice in explosions. (#38435)

* Fixes clothes getting damaged twice in explosions.
 2018-06-15 02:44:01 -07:00
CitadelStationBot
0ab6db65a7 [MIRROR] BoH bombs now forcefully stun anyone flying when they go off (#7100) 
* BoH bombs now forcefully stun anyone flying when they go off (#38397)

* Update bag_of_holding.dm

* Incorrect type.

* BoH bombs now forcefully stun anyone flying when they go off
 2018-06-13 19:44:43 -07:00
LetterJay
8b65c88f64 Merge pull request #7077 from Citadel-Station-13/upstream-merge-38404 
[MIRROR] Fixes unintentional vehicle buff
 2018-06-12 08:08:51 -05:00
kevinz000
4d9645766a Fixes unintentional vehicle buff (#38404) 2018-06-12 00:57:53 -05:00
oranges
4f379bb0d0 Merge pull request #38376 from AutomaticFrenzy/patch/lockbox 
[s] Fix lockboxes not actually being locked
 2018-06-11 22:30:08 -05:00
XDTM
c67fe4a76f Anti-magic component start enabled (#38388) 2018-06-11 00:16:00 -05:00
CitadelStationBot
8413eb2888 [MIRROR] Squashes traitors under one path (#7049) 
* Squashes traitors under one path (#38332)

* Squashes traitors under one path
 2018-06-10 12:30:00 -07:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128 
[MIRROR] Standardizes and cleans up some admin messages & logging
 2018-06-09 05:53:25 +00:00
Jordan Brown
7c5217746f Merge pull request #38309 from kevinz000/patch-517 
Vehiclecode is now far more responsive when their movespeed delays are changed after they move.
 2018-06-07 08:40:39 -05:00
AnturK
717e635d28 Fixes some holocall stuff (#38209) 
* Fixes some holocall stuff

* Yep
 2018-06-06 14:25:23 -05:00
81Denton
9fd7bfb347 Blacklist ion trails from chasms (#38284) 2018-06-05 13:29:53 -05:00
CitadelStationBot
0b362e017b [MIRROR] Lavaland Clock Cult Ruin (#7011) 
* Lavaland Clock Cult Ruin (#38263)

* Dead Ratvar

* tgm map

* Lavaland Clock Cult Ruin
 2018-06-05 11:16:55 -07:00
LetterJay
896eb8cacb Merge pull request #7004 from Citadel-Station-13/upstream-merge-38257 
[MIRROR] Fixes some advanced disease thresholds
 2018-06-03 16:23:58 -05:00
LetterJay
9c4d7ca029 Merge pull request #7001 from Citadel-Station-13/upstream-merge-38228 
[MIRROR] we can stop using getFlatIcon?
 2018-06-03 16:22:09 -05:00
Yenwodyah
6791d13e81 Fix some advanced disease thresholds (#38257) 2018-06-03 15:47:20 -05:00