shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,722 Commits 5 Branches 0 Tags
75359598b399902e8ddb2ae7c714d5e30a0de7c5
Commit Graph
4075 Commits
Author SHA1 Message Date
LetterJayandGitHub 75359598b3 Merge pull request #2988 from Citadel-Station-13/upstream-merge-31060 
[MIRROR] Fixes larva evolving while restrained
 2017-09-29 01:43:07 -04:00
LetterJayandGitHub 80e92ebdc5 Merge pull request #2987 from Citadel-Station-13/upstream-merge-30858 
[MIRROR] [READY]Refactors timestops to use fields
 2017-09-29 01:42:56 -04:00
LetterJayandGitHub 3c608b3ad4 Merge pull request #2986 from Citadel-Station-13/upstream-merge-31079 
[MIRROR] Remove unused ninja team var
 2017-09-29 01:42:31 -04:00
LetterJayandGitHub c8a03440cb Merge pull request #2978 from Citadel-Station-13/upstream-merge-30834 
[MIRROR] Self replacement fix
 2017-09-29 01:42:17 -04:00
LetterJayandGitHub 8f5d02be55 Merge pull request #2977 from Citadel-Station-13/upstream-merge-31027 
[MIRROR] GetAllContents performance increase
 2017-09-29 01:41:58 -04:00
LetterJayandGitHub cef4ae4fd6 Merge pull request #2975 from Citadel-Station-13/upstream-merge-30661 
[MIRROR] Advanced camera consoles use a list for z lock rather than a single z level
 2017-09-29 01:41:32 -04:00
LetterJayandGitHub 02a5c92233 Merge pull request #2974 from Citadel-Station-13/upstream-merge-31046 
[MIRROR] AFK players count as dead for the assassinate objective
 2017-09-29 01:41:16 -04:00
LetterJayandGitHub 595f2cb08f Merge pull request #2983 from Citadel-Station-13/upstream-merge-30985 
[MIRROR] Fixes frozen PDAs in the game logs
 2017-09-29 01:39:50 -04:00
LetterJayandGitHub 4af02dff06 Merge pull request #2984 from Citadel-Station-13/upstream-merge-30613 
[MIRROR] Applying PDA overhaul Upstream
 2017-09-29 01:39:28 -04:00
LetterJayandGitHub 157d9cc6e6 Merge pull request #2982 from Citadel-Station-13/upstream-merge-30864 
[MIRROR] Secure containers give more hints, no RNG, for hacking
 2017-09-29 01:39:03 -04:00
ShizCalevandCitadelStationBot 9da41c3596 Stops revheads from being metagamed with healthscanners & medical HUDs. (#31110) 
* Stops revheads metagaming

* Added comment.
 2017-09-28 22:00:16 -05:00
YPOQandCitadelStationBot a780d6f79e Fixes larva evolving while restrained (#31060) 2017-09-28 21:46:43 -05:00
kevinz000andCitadelStationBot 724fa8ce54 [READY]Refactors timestops to use fields (#30858) 
* kek

* fixes

* Fixes

* fixes

* throw freeze

* woops

* double woops
 2017-09-28 21:46:34 -05:00
pubbyandCitadelStationBot 3c769e323e Remove unused ninja team var 2017-09-28 21:45:02 -05:00
TungstenandCitadelStationBot c6c6f67d03 Applying PDA overhaul Upstream (#30613) 
* Applying PDA overhaul Upstream

Yeet?

* Used lordpidey's change

Like this?

* The build failed so I'm changing it back

* Update PDA.dm

* Update PDA.dm

* Make the settings visible only on the main screen

mode 0 is the hub, and the hub is the main menu. I think it'd be a lot more convenient for players to always have these options on the main menu if they need them. Makes it really easy to swap colors and fonts at the beginning of the round. I can put it in a settings menu if everyone really thinks it's necessary, but then someone would have to help me actually make the damn icons show up.

* Update PDA.dm

* Update PDA.dm

* Wait, I'm an idiot. I was editing the wrong thing.

* Here's your switch statements boi

* Declare font_index at the "Toggle_Font" code

I declared it exactly where it's relevant, but I think this looks unclean. I also redefined it which I actually needed to do.

* Replaced it where it was

cuz the build broke

* Make the color changer a picker instead of a field

An attempt

* Made these defines

@optimumtact @Cyberboss Like this?
 2017-09-28 21:43:32 -05:00
orangesandCitadelStationBot 367fcc9974 Merge pull request #30985 from tgstation/Cyberboss-patch-5 
Fixes frozen PDAs in the game logs
 2017-09-28 21:42:20 -05:00
RobustinandCitadelStationBot 3fe37eb41b Secure containers give more hints, no RNG, for hacking (#30864) 
* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Removes bad RNG

* More instructions

* gud grammer

* Right parenthesis

* Update secure.dm

* Update secure.dm

* Update secure.dm

* less explicit
 2017-09-28 21:41:07 -05:00
LetterJayandGitHub d25894447e Merge pull request #2971 from Citadel-Station-13/upstream-merge-31048 
[MIRROR] Fixed duplicate definition
 2017-09-28 12:32:57 -04:00
LetterJayandGitHub 207e7d8f71 Merge pull request #2970 from Citadel-Station-13/upstream-merge-31042 
[MIRROR] Fixes SSqueak/Initialize() not returning ..()
 2017-09-28 12:29:22 -04:00
LetterJayandGitHub 3e27458d11 Merge pull request #2968 from Augustfox/master 
Organize hair and facial hair in character creation
 2017-09-28 12:29:10 -04:00
LetterJayandGitHub 4e19b5a5f8 Merge pull request #2969 from Citadel-Station-13/upstream-merge-31041 
[MIRROR] Removes some spawns
 2017-09-28 12:25:33 -04:00
LetterJayandGitHub e6356d2560 Merge pull request #2955 from Citadel-Station-13/upstream-merge-31020 
[MIRROR] Variants will not be spawned by gold cores
 2017-09-28 12:22:44 -04:00
LetterJayandGitHub b2682b401c Merge pull request #2963 from Citadel-Station-13/upstream-merge-31035 
[MIRROR] Makes the mining vendor give more verbose feedback
 2017-09-28 12:22:10 -04:00
LetterJayandGitHub 355b9af67e Merge pull request #2960 from Citadel-Station-13/upstream-merge-30957 
[MIRROR] Revheads are now stealthier/harder to metagame
 2017-09-28 12:21:53 -04:00
Jordan BrownandCitadelStationBot a3c7a3fe11 Self replacement fix (#30834) 2017-09-28 11:08:02 -05:00
Emmett GainesandCitadelStationBot 16f1ceedd1 GetAllContents performance increase (#31027) 2017-09-28 10:44:28 -05:00
KorPhaeronandCitadelStationBot 6fca708b33 Advanced camera consoles use a list for z lock rather than a single z level (#30661) 
* Refactor Abductor Console

* Station lock
 2017-09-28 10:44:12 -05:00
Y0SH1M4S73RandCitadelStationBot 602e1e6bbf AFK players count as dead for the assassinate objective (#31046) 2017-09-28 10:43:58 -05:00
AutomaticFrenzyandCitadelStationBot 91c1a78af9 Fixed duplicate definition (#31048) 2017-09-28 10:43:24 -05:00
Jordan BrownandCitadelStationBot 659c92a0d6 Fixes SSqueak not returning ..() 2017-09-28 10:43:16 -05:00
Jordan BrownandCitadelStationBot 97b8a6ed3b Removes some spawns 2017-09-28 10:43:07 -05:00
CitadelStationBotandkevinz000 2d48a0cf50 [MIRROR] Makes borg modules and human species easily spawnable by admins from the mob spawn menu. (#2967) 
* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.

* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.
 2017-09-28 05:59:57 -07:00
CitadelStationBotandkevinz000 4f281e5ea1 [MIRROR] Blackbox stat for internet midis (#2964) 
* Blackbox stat for internet midis

* Blackbox stat for internet midis
 2017-09-28 05:56:26 -07:00
Augustfox 612707c999 Alphabetize hair and facial hair in char creation 
🆑
Reordered hair in a semi-alphabetized list for easier use in character creation.
Alphabetized facial hair for easier use in character creation.
/🆑
No names or content changed other then order in list.
 2017-09-27 23:45:15 -05:00
LetterJayandGitHub 64ff719843 Merge pull request #2956 from Citadel-Station-13/upstream-merge-30942 
[MIRROR] Adds installing cells as part of mech construction and fixes some mech construction bugs.
 2017-09-27 23:45:50 -04:00
LetterJayandGitHub 7a0ffb8a67 Merge pull request #2941 from Citadel-Station-13/upstream-merge-30888 
[MIRROR] Refactors cinematics.
 2017-09-27 23:42:35 -04:00
LetterJayandGitHub d8de375ada Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969 
[MIRROR] DisplayTimeText mk2
 2017-09-27 23:39:03 -04:00
LetterJayandGitHub f3da8a48a0 Update critter.dm 2017-09-27 19:11:11 -05:00
LetterJayandGitHub 1ea098b805 Update pod.dm 2017-09-27 19:10:48 -05:00
LetterJayandGitHub 68f3b5e719 Update time.dm 2017-09-27 19:10:26 -05:00
LetterJayandGitHub 31a9164362 Update combat.dm 2017-09-27 16:27:21 -05:00
LetterJayandGitHub aa74660722 Update construction_datum.dm 2017-09-27 16:27:09 -05:00
ShizCalevandCitadelStationBot 9b2f07335a Makes the mining vendor give more verbose feedback 2017-09-27 15:45:19 -05:00
LetterJayandGitHub 69fa79f974 Update ticker.dm 2017-09-27 15:33:42 -05:00
LetterJayandGitHub 18545eb41c Merge pull request #2935 from Citadel-Station-13/upstream-merge-30893 
[MIRROR] Datum abductors refactor
 2017-09-27 16:31:53 -04:00
LetterJayandGitHub 000ce51c9a Merge pull request #2927 from Citadel-Station-13/upstream-merge-30958 
[MIRROR] Makes a flags var use NONE instead of 0
 2017-09-27 16:31:38 -04:00
LetterJayandGitHub a099fb627c Merge pull request #2918 from Citadel-Station-13/upstream-merge-30953 
[MIRROR] Suiciding with a gun blows your brain out
 2017-09-27 16:31:25 -04:00
RobustinandCitadelStationBot f71c3d6614 Revheads are now stealthier/harder to metagame (#30957) 
* stealthier revs

* Stealthiest Revheads

* Update revolution.dm
 2017-09-27 15:28:35 -05:00
LetterJayandGitHub 0387f81ed5 Update ticker.dm 2017-09-27 15:16:05 -05:00
LetterJayandGitHub 2e133c0b2c Update ears.dm 2017-09-27 15:12:22 -05:00