shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,930 Commits 5 Branches 0 Tags
317958fb5ccf9503d8f8fb7db71ff04652b0eabb
Commit Graph

2093 Commits

Author SHA1 Message Date
AnturK
317958fb5c Fixes more CanPass misuse (#30493) 
* Fixes more CanPass misuse

* Let's not give wrong impression

* spans
 2017-09-09 19:41:02 -05:00
LetterJay
7baf203862 Merge pull request #2656 from Citadel-Station-13/upstream-merge-30457 
[MIRROR] Adds Internet admin midi
 2017-09-09 01:07:05 -05:00
LetterJay
f47e4a8280 Merge pull request #2666 from Citadel-Station-13/upstream-merge-30498 
[MIRROR] Golem shells can no longer fit in bags
 2017-09-09 01:04:23 -05:00
LetterJay
5c4940c832 Merge pull request #2663 from Citadel-Station-13/upstream-merge-30389 
[MIRROR] Adds a short telegraph to the watcher's blasts
 2017-09-09 01:03:15 -05:00
LetterJay
5202705ed7 Merge pull request #2662 from Citadel-Station-13/upstream-merge-30487 
[MIRROR] Adds shamebrero penguin for dumb alphonzo
 2017-09-09 01:02:50 -05:00
CitadelStationBot
d35717e1ab [MIRROR] Fixes assault pod blinking docking effects (#2667) 
* Fixes assault pod blinking docking effects (#30492)

* Fixes assault pod blinking docking effects
 2017-09-08 20:15:10 -05:00
Robustin
8010c44c72 Golem shells can no longer fit in bags (#30498) 
* Automatic changelog generation for PR #30056 [ci skip]

* RIP pocket army

* Delete AutoChangeLog-pr-30056.yml
 2017-09-08 13:53:00 -05:00
Ashe Higgs
2f438e5f4a Adds a short telegraph to the watcher's blasts (#30389) 
* Adds a telegraph to the watcher's blasts

* hmm
 2017-09-08 10:18:41 -05:00
Militaires
2ab29ccac4 Adds shamebrero penguin for dumb alphonzo (#30487) 2017-09-08 10:11:21 -05:00
JJRcop
00dd2f283b Adds Internet admin midi (#30457) 
* Adds Internet admin midi

* Moves global regex into proc (shell_url_scrub)

* Moves shelleo to world
Adds quotes around the command in shelleo, to encapsulate it

* Admins can stop playing web sounds

* Revised internet midi extension order
Moved m4a to least preferred,
as it can potentially carry non-aac or non-mpeg-3 audio

* Kills \n in web sound

* play_web_sound availability based on config

* play web sound and shelleo tweaks

istypeless for in play web sound & readability parenthesis around binary AND
add return index defines for shelleo proc

* Security fix for play web sound
 2017-09-08 09:32:29 -05:00
Poojawa
ce787e7726 Reverts sav file persistance for poly/pun-pun (#2654) 
* Reverts sav file persistance for poly/pun-pun

* makes sure poly writes to poly
 2017-09-08 06:58:08 -05:00
LetterJay
a806ecad19 Merge pull request #2651 from Citadel-Station-13/upstream-merge-30486 
[MIRROR] Fixes goliath butchering
 2017-09-07 15:57:03 -05:00
LetterJay
93a98c000b Merge pull request #2648 from Citadel-Station-13/upstream-merge-30460 
[MIRROR] You can't fly with hair on your wings [Bee Suit Hair Suffix Fix]
 2017-09-07 15:54:49 -05:00
LetterJay
ff219f365e Update goliath.dm (#30486) 2017-09-07 11:58:42 -05:00
ExcessiveUseOfCobblestone
b6eddd8845 ok 2017-09-07 10:34:36 -05:00
AnturK
df3b4c10bc Fixes containment field CanPass 2017-09-07 10:34:11 -05:00
LetterJay
c55ac69e4a Merge pull request #2634 from Citadel-Station-13/upstream-merge-30458 
[MIRROR] Allows atmos techs to download the SM monitor
 2017-09-07 10:23:15 -05:00
Ashe Higgs
938c10ad1c Adds a unique suicide to the hierophant club, plus some attack verbs (#30400) 
* Adds a suicide to the hierophant club

* Above

* good point

* Removes the delay
 2017-09-07 10:01:55 -05:00
LetterJay
31102d0ec4 Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262 
[MIRROR] Soft crit, except not terrible
 2017-09-07 10:01:35 -05:00
LetterJay
8299cf576c this sure was FUN 2017-09-07 09:47:56 -05:00
LetterJay
1162edad65 Merge pull request #2632 from Citadel-Station-13/upstream-merge-30452 
[MIRROR] Alters the pressure plate crafting recipe
 2017-09-07 06:26:51 -05:00
LetterJay
5829f56727 Merge pull request #2531 from Citadel-Station-13/upstream-merge-30176 
[MIRROR] Adds more round id tracking
 2017-09-06 21:31:28 -05:00
ShizCalev
4282d82e33 Allows atmos techs to download the SM monitor (#30458) 2017-09-06 21:00:25 -05:00
Anonmare
ee41b3da6f Alters the pressure plate crafting recipe (#30452) 2017-09-06 20:35:50 -05:00
LetterJay
3efa1d6134 Merge pull request #2631 from Citadel-Station-13/upstream-merge-30416 
[MIRROR] Adds "shiny" variants of lavaland mobs
 2017-09-06 20:18:27 -05:00
Ashe Higgs
dcd0fa67f0 Adds "shiny" variants of lavaland mobs (#30416) 
* Shiny lavaland mobs!

* Changes based on feedback
 2017-09-06 19:15:25 -05:00
ShizCalev
849deb5e4e Cleans up more paper fluff varedits. (#30418) 2017-09-06 18:42:43 -05:00
LetterJay
2f3f56352c Merge branch 'master' into upstream-merge-30176 2017-09-06 17:43:07 -05:00
LetterJay
f9ef2bb068 commit 2017-09-06 17:36:32 -05:00
LetterJay
17db844180 another mirror rebase for the PRMirror being down 2017-09-06 17:32:49 -05:00
LetterJay
a16ba4e4cd Merge pull request #2445 from Citadel-Station-13/upstream-merge-29953 
[MIRROR] Add logging of deathgasp last words and suicide stats to the death table
 2017-09-06 10:11:16 -05:00
LetterJay
4ed411d353 Merge pull request #2462 from Citadel-Station-13/upstream-merge-30079 
[MIRROR] Fixes missing inhands
 2017-09-06 10:11:08 -05:00
LetterJay
d4f018952e Merge pull request #2440 from Citadel-Station-13/upstream-merge-29866 
[MIRROR] You can now click on symptoms in the Pandemic to see their description and stats
 2017-09-06 10:10:58 -05:00
LetterJay
82f36f0d28 Delete client_procs.dm.rej 2017-09-06 09:27:57 -05:00
LetterJay
b07ebeed57 Merge pull request #2480 from Citadel-Station-13/upstream-merge-30140 
[MIRROR] Corrects column name
 2017-09-06 09:26:12 -05:00
LetterJay
24a7aa5a9f Merge branch 'master' into upstream-merge-30079 2017-09-06 09:24:23 -05:00
LetterJay
ea10c4402e Merge pull request #2443 from Citadel-Station-13/upstream-merge-30027 
[MIRROR] Fixes hair sticking out of spess helmets
 2017-09-06 09:22:44 -05:00
LetterJay
00199af27d Merge branch 'master' into upstream-merge-29866 2017-09-06 09:21:53 -05:00
LetterJay
72a8f7aa54 Merge branch 'master' into upstream-merge-29953 2017-09-06 09:17:57 -05:00
LetterJay
cf46abecb3 Merge pull request #2436 from Citadel-Station-13/upstream-merge-30004 
[MIRROR] Moved emagged var to obj/item parent.
 2017-09-06 09:15:11 -05:00
LetterJay
2d469c62ef Merge pull request #2617 from Citadel-Station-13/BadMirrorResolve 
Bad mirror resolve
 2017-09-06 08:59:20 -05:00
Poojawa
fc95b9594c Re-disables sabresune, because wew 2017-09-05 21:23:15 -05:00
LetterJay
af409af9cf additional files 2017-09-05 16:29:25 -05:00
LetterJay
bae0563d47 initial commit 2017-09-05 16:17:50 -05:00
Poojawa
9bca718151 Fixes prey digestion noises and loop (#2616) 2017-09-05 12:53:35 -05:00
Poojawa
ef83a2db86 enables sabresune but locked for reason. 2017-09-05 07:33:55 -05:00
Poojawa
3a76fdc2e9 Update supply.dm 2017-09-04 21:26:19 -05:00
Poojawa
32742f0b53 fixes skunk tails too 2017-09-04 09:28:50 -05:00
Poojawa
362b4b5a16 Fixes Poly (#2598) 2017-09-04 09:08:25 -05:00
Poojawa
5f1d88ffeb Revert "[MIRROR] Port material containers to datum components" (#2597) 
* Revert "sprite fix on kitsune tails"

This reverts commit 44d5b21a43.

* Revert "Update vg_clothing_packs.dm (#2591)"

This reverts commit 7f46280d6b.

* Revert "Automatic changelog generation for PR #2590 [ci skip]"

This reverts commit 201e07033f.

* Revert "[MIRROR] Gives the detective a mass spectrometer (#2590)"

This reverts commit 5c98b9a13b.

* Revert "Quick sync (#2587)"

This reverts commit 92e055be97.

* Revert "Automatic changelog generation for PR #2557 [ci skip]"

This reverts commit 241a10d88d.

* Revert "Decreases hacked ai module cost (#2557)"

This reverts commit d959b7538a.

* Revert "[MIRROR] Port material containers to datum components (#2562)"

This reverts commit 32300086d5.
 2017-09-04 09:07:40 -05:00