shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,713 Commits 5 Branches 0 Tags
c8a03440cb68db6624f2ed4ce2ef7c2e2ccd7978
Commit Graph

540 Commits

Author SHA1 Message Date
LetterJay
c8a03440cb Merge pull request #2978 from Citadel-Station-13/upstream-merge-30834 
[MIRROR] Self replacement fix
 2017-09-29 01:42:17 -04:00
LetterJay
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
LetterJay
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
LetterJay
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
ShizCalev
9da41c3596 Stops revheads from being metagamed with healthscanners & medical HUDs. (#31110) 
* Stops revheads metagaming

* Added comment.
 2017-09-28 22:00:16 -05:00
Tungsten
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
oranges
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
Robustin
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
Jordan Brown
a3c7a3fe11 Self replacement fix (#30834) 2017-09-28 11:08:02 -05:00
AutomaticFrenzy
91c1a78af9 Fixed duplicate definition (#31048) 2017-09-28 10:43:24 -05:00
LetterJay
d8de375ada Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969 
[MIRROR] DisplayTimeText mk2
 2017-09-27 23:39:03 -04:00
LetterJay
18545eb41c Merge pull request #2935 from Citadel-Station-13/upstream-merge-30893 
[MIRROR] Datum abductors refactor
 2017-09-27 16:31:53 -04:00
LetterJay
47a8ce6ae8 Merge pull request #2939 from Citadel-Station-13/upstream-merge-30863 
[MIRROR] Bluespace pipes
 2017-09-26 14:58:23 -04:00
Jordan Brown
0a43bddaa1 Merge pull request #30863 from pubby/bluepipe 
Bluespace pipes
 2017-09-25 12:28:14 -05:00
LetterJay
8fd6d9d883 Merge pull request #2933 from Citadel-Station-13/upstream-merge-30980 
[MIRROR] Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart
 2017-09-25 13:28:05 -04:00
LetterJay
d8736482fd Update transfer_valve.dm 2017-09-25 11:55:09 -05:00
ShizCalev
169aa85d9c DisplayTimeText mk2 2017-09-24 18:59:57 -05:00
pubby
34e186dadb Datum abductors refactor 2017-09-24 18:00:49 -05:00
vuonojenmustaturska
11a3395690 Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart 2017-09-24 17:42:13 -05:00
oranges
6278d49662 Href tokens 2017-09-24 17:34:37 -05:00
LetterJay
e16d89d077 Merge pull request #2923 from jughu/hi-hello 
Allows custom renaming for holy weapons
 2017-09-24 15:49:19 -04:00
MoreRobustThanYou
df607bb24c Implant Chairs now also support organs (#30982) 
* Implant Chairs now also support organs

* Update implantchair.dm

* Update implantchair.dm
 2017-09-24 11:55:22 -05:00
jughu
617eb4c889 The new hip 2017-09-24 01:04:39 +02:00
jughu
5b1b550c0e Update holy_weapons.dm 2017-09-24 00:34:24 +02:00
Robustin
894673ef97 Fixes revolutionary deconversion messages and logging 2017-09-23 11:07:05 -05:00
CitadelStationBot
222274d108 [MIRROR] Using a soulstone on somebody now transfers your languages to the shade (#2911) 
* Merge pull request #30939 from MoreRobustThanYou/patch-8

Using a soulstone on somebody now transfers your languages to the shade

* Using a soulstone on somebody now transfers your languages to the shade
 2017-09-23 05:53:56 -05:00
CitadelStationBot
a286d0c313 [MIRROR] Gives engineering cyborgs an item they can use in place of circuits for basic construction (#2875) 
* Gives engineering cyborgs an item they can use in place of circuits for basic construction

* fixes
 2017-09-22 23:35:54 -05:00
CitadelStationBot
eb36f34267 [MIRROR] Specifies one format of variable declaration for the codebase. (#2895) 
* Specifies one format of variable declaration for the codebase.

* dumb mirroring
 2017-09-22 23:35:36 -05:00
CitadelStationBot
2a860d1954 [MIRROR] More Initialize() fixes, requires someone to test with DB (#2857) 
* More Initialize() fixes, requires someone to test with DB

* fucking mirror failure
 2017-09-22 23:35:22 -05:00
CitadelStationBot
2757fae7e2 [MIRROR] Fixes shaving headless mobs (#2890) 
* Fixes shaving headless mobs

* Update cosmetics.dm
 2017-09-22 22:31:54 -05:00
CitadelStationBot
2c78f7122c [MIRROR] Adds some new plushies (#2866) 
* Adds some new plushies

* Update packs.dm
 2017-09-22 22:31:07 -05:00
CitadelStationBot
6efb76fad5 [MIRROR] Ammo cleanup (#2643) 
* Ammo cleanup

* Update briefcase.dm

* Update manned_turret.dm

* Update mime.dm

* Update manned_turret.dm

* Update manned_turret.dm

* fixes

* mime memes
 2017-09-22 22:30:44 -05:00
CitadelStationBot
8ef3861b0b [MIRROR] New squeaky datum and plushes (#2847) 
* New squeaky datum and plushes

* Update bananashoes.dm
 2017-09-22 19:43:56 -05:00
oranges
41277ff110 Removes old debug text 2017-09-21 06:30:11 -05:00
LetterJay
50e9dd17b6 Merge pull request #2801 from Citadel-Station-13/upstream-merge-30745 
[MIRROR] Dice will now roll when thrown
 2017-09-19 12:20:34 -04:00
Poojawa
b6fdbb54f5 Update dice.dm 2017-09-19 06:35:36 -05:00
CitadelStationBot
d4a577014a [MIRROR] Fixes esaw icon (#2831) 
* Fixes esaw icon

* Update energy.dm
 2017-09-18 01:46:20 -05:00
CitadelStationBot
d8a1fc936e [MIRROR] Stops AIs from taking actions while depowered (#2813) 
* Stops AIs from taking actions while depowered

* Update ai.dm
 2017-09-18 01:45:59 -05:00
CitadelStationBot
201cb984c8 [MIRROR] Fix ingredient box icon (again) (#2823) 
* Fix ingredient boxes

* Fix ingredient box icon (again)
 2017-09-17 22:36:21 -05:00
CitadelStationBot
4dd0dc9d66 [MIRROR] Various grammar fixes (#2842) 
* Various grammar fixes

* Update mecha_parts.dm

* Update crates.dm

* Update ghost_role_spawners.dm

* Update paper_premade.dm

* Update oldstation.dm
 2017-09-17 22:35:51 -05:00
CitadelStationBot
b09aa9d082 [MIRROR] Fixes stacking when crafting items (#2814) 
* Merge pull request #30746 from YPOQ/stackfix

Fixes stacking when crafting items

* Fixes stacking when crafting items
 2017-09-17 12:03:31 -05:00
CitadelStationBot
ada383e629 [MIRROR] Clarifies the egyptian staff desc (#2811) 
* Clarifies the egyptian staff desc (#30765)

* Clarifies the egyptia staff desc

* I can't write

* Clarifies the egyptian staff desc
 2017-09-17 12:03:12 -05:00
CitadelStationBot
acc2104068 [MIRROR] Adds href token to station name rejection (#2798) 
* Adds href token to station name rejection (#30740)

* Adds href token to station name rejection

* Update charter.dm

* Adds href token to station name rejection
 2017-09-17 12:00:39 -05:00
CitadelStationBot
cbfee7e313 [MIRROR] Tank gauge rounding fix (#2800) 
* Merge pull request #30749 from ShizCalev/tank-display-fix

Tank gauge rounding fix

* Tank gauge rounding fix
 2017-09-17 11:58:50 -05:00
CitadelStationBot
d96f3f40a5 [MIRROR] PDA game log entry contains ckey (#2808) 
* PDA game log entry contains ckey

* PDA game log entry contains ckey
 2017-09-17 11:58:11 -05:00
Robustin
422373e649 Dice will now roll when thrown 2017-09-16 11:37:38 -05:00
CitadelStationBot
e4af04823a [MIRROR] Fix pressure plate spam (#2775) 
* Fix pressure plate spam (#30736)

* Fix pressure plate spam

* Not everything has feet

* Pressure plates . = ..()

* Fix pressure plate spam
 2017-09-16 04:35:45 -05:00
CitadelStationBot
af0080b00b [MIRROR] Stops ranged stack splitting (#2785) 
* Merge pull request #30695 from KorPhaeron/magicstacks

Stops ranged stack splitting

* Stops ranged stack splitting
 2017-09-15 02:51:53 -05:00
CitadelStationBot
e4db027692 [MIRROR] Fixes to more Initialize procs (#2733) 
* Fixes to more Initialize procs

* Update ai_monitored.dm

* Update cleanable.dm

* Update instruments.dm

* Update musician.dm

* Update noticeboard.dm

* Update mimic.dm

* Update interactive.dm
 2017-09-13 22:54:12 -05:00
CitadelStationBot
b4c27d5533 [MIRROR] Chainsaws now have a suicide! (#2734) 
* Chainsaws now have a suicide! (#30559)

* i have the power !!

thanks, cobby!

* help my code is growing out of control

i'm not even touching the keyboard anymore

* do you like.... my car

* nobody saw that, compile BEFORE you commit kids

* LITERALLY THE BEST COMMIT OF ALL TIME

THANKS AGAIN COBBY FOR FIXING IT UP

* FINISHING PR

ICING ON CAKE

* LET THERE BE SOUND!

* mokay then

* really should have gotten around to this

yep

* Chainsaws now have a suicide!
 2017-09-13 22:53:55 -05:00