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

3531 Commits

Author SHA1 Message Date
Ashe Higgs
af5ffcc83a Adds departmental banners 2017-09-11 13:37:58 -05:00
LetterJay
01a5e4bddf Merge pull request #2600 from Citadel-Station-13/Lisp 
disables the lisp that lizard tongues have
 2017-09-11 13:16:15 -05:00
LetterJay
532d8bd0a6 Merge pull request #2558 from Citadel-Station-13/upstream-merge-30268 
[MIRROR] Adds db connectivity check to jobban cache building
 2017-09-11 13:12:38 -05:00
LetterJay
74a163db23 Merge pull request #2553 from Citadel-Station-13/upstream-merge-30252 
[MIRROR] Server tools versioning and fix to displayed testmerges
 2017-09-11 13:12:10 -05:00
CitadelStationBot
8ee6fdb76a [MIRROR] Fixes stop-sounds not force-stopping internet midis (#2692) 
* Fixes stop-sounds not force-stopping internet midis (#30571)

* Update playsound.dm

* Update preferences_toggles.dm (#17)

* Fixes stop-sounds not force-stopping internet midis
 2017-09-10 20:29:12 -07:00
LetterJay
48a20c94b9 Merge pull request #2688 from Citadel-Station-13/upstream-merge-30382 
[MIRROR] Adds cybernetic lungs(and an upgraded and actually useful variety) to the game.
 2017-09-10 15:53:04 -05:00
LetterJay
0a30d7e962 Merge pull request #2646 from Citadel-Station-13/upstream-merge-30466 
[MIRROR] Fixes drone light toggle while dead
 2017-09-10 15:23:45 -05:00
Firecage
1e0297f9ef Adds cybernetic lungs(and an upgraded and actually useful variety) to the game. (#30382) 
* Adds cybernetic lungs

* Added better cold thresholds to the upgraded cybernetic lungs. Heat threshold remains the same though for balance reasons.

* Adds an EMP effect to cybernetic lungs.
 2017-09-10 14:31:47 -05:00
LetterJay
72bd5e18f4 Merge pull request #2682 from Citadel-Station-13/upstream-merge-30518 
[MIRROR] Ladders cant be moved by the singularity
 2017-09-10 09:47:20 -05:00
LetterJay
685c534d88 Merge pull request #2681 from Citadel-Station-13/upstream-merge-30524 
[MIRROR] Removes a src.
 2017-09-10 09:47:01 -05:00
CitadelStationBot
b363dc352f [MIRROR] remove GLOB. (#2683) 
* Merge pull request #30540 from p440/blobglob

remove GLOB.

* remove GLOB.
 2017-09-10 09:07:18 -05:00
KorPhaeron
55f9874a08 Ladders cant be moved by the singularity (#30518) 
It'd be weird to have the top part of a ladder moved five tiles and then still lead to the ladder underneath its old location. Just destroys it instead.
 2017-09-10 06:06:17 -05:00
oranges
ee4052eb61 Merge pull request #30524 from ChangelingRain/srcremoval 
Removes a src.
 2017-09-10 06:02:06 -05:00
LetterJay
3a30daa2ec Merge pull request #2674 from Citadel-Station-13/upstream-merge-30520 
[MIRROR] Fix Hearty Punch healing to include softcrit
 2017-09-09 23:50:20 -05:00
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
msgerbs
3ceb70f84d Fix crit-only healing to include softcrit (#30520) 
With softcrit implemented, people are only unconcious in hard crit. This will no longer bring you out of crit as intended. This PR fixes that.
 2017-09-09 16:29:36 -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
41a3fd8467 Merge pull request #2672 from Citadel-Station-13/upstream-merge-30481 
[MIRROR] Placing a robotics factory actually disables shunting
 2017-09-09 01:05:54 -05:00
LetterJay
ba3f92fa17 Merge pull request #2671 from Citadel-Station-13/upstream-merge-30504 
[MIRROR] Windoors open when emagged again
 2017-09-09 01:05:30 -05:00
LetterJay
a3e5bfc496 Merge pull request #2669 from Citadel-Station-13/upstream-merge-30489 
[MIRROR] Makes computers lose their light when their screens break
 2017-09-09 01:05:09 -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
LetterJay
780faec591 Merge pull request #2652 from Citadel-Station-13/upstream-merge-30202 
[MIRROR] You can now drag things up and down ladders
 2017-09-09 00:59:58 -05:00
Jordan Brown
5b61c84df4 Merge pull request #30481 from YPOQ/shuntfix 
Placing a robotics factory actually disables shunting
 2017-09-08 21:25:28 -05:00
Jordan Brown
d60a6729d3 Merge pull request #30504 from YPOQ/windooremagfix 
Windoors open when emagged again
 2017-09-08 21:22:16 -05:00
oranges
25a5325e24 Merge pull request #30489 from Cyberboss/CompLightFix 
Makes computers lose their light when their screens break
 2017-09-08 21:01:39 -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
Poojawa
62225acc2b Update verbs.dm 2017-09-08 06:56:31 -05:00
Poojawa
50cd75df7d Actually makes Citadel reagents process (#2653) 2017-09-08 06:55:19 -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
d5c4f6e62d Merge pull request #2649 from Citadel-Station-13/upstream-merge-30451 
[MIRROR] Disablers and ions wont burn plasma statues statues
 2017-09-07 15:55:04 -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
217e077342 Merge pull request #2645 from Citadel-Station-13/upstream-merge-30469 
[MIRROR] Fixes containment field CanPass
 2017-09-07 15:54:34 -05:00
LetterJay
82cfa67581 Merge pull request #2644 from Citadel-Station-13/upstream-merge-30233 
[MIRROR] Adds a message when trying to move while buckled
 2017-09-07 15:53:38 -05:00
KorPhaeron
b9bbd348df You can now drag things up and down ladders (#30202) 
* Can drag things up and down ladders

* Somehow left out this line

* Icon update, auto_connect

* Uses the proper pulling proc
 2017-09-07 12:48:43 -05:00
LetterJay
ff219f365e Update goliath.dm (#30486) 2017-09-07 11:58:42 -05:00
KorPhaeron
b172025e96 Disablers and ions wont burn statues 2017-09-07 10:34:44 -05:00
ExcessiveUseOfCobblestone
b6eddd8845 ok 2017-09-07 10:34:36 -05:00
kingofkosmos
f4dbb6dc36 Fixes drone light toggle while dead 2017-09-07 10:34:20 -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
LetterJay
21a72cd04c Merge pull request #2640 from Citadel-Station-13/upstream-merge-30436 
[MIRROR] More timer debugging for the debug gods.
 2017-09-07 10:22:45 -05:00
LetterJay
9ca0d6588d Merge pull request #2642 from Citadel-Station-13/upstream-merge-30400 
[MIRROR] Adds a unique suicide to the hierophant club, plus some attack verbs
 2017-09-07 10:22:17 -05:00
LetterJay
8d854a53d8 Merge pull request #2637 from Citadel-Station-13/upstream-merge-30426 
[MIRROR] Fixes swarmers breaking the SM's containment
 2017-09-07 10:21:57 -05:00