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

3568 Commits

Author SHA1 Message Date
LetterJay
584bb8dc64 Update holder2.dm 2017-09-11 18:27:04 -05:00
LetterJay
15c4d34b55 Update create_turf.dm 2017-09-11 18:26:50 -05:00
LetterJay
98f6cf208b Update create_object.dm 2017-09-11 18:26:36 -05:00
LetterJay
bb463cef48 Update create_mob.dm 2017-09-11 18:26:13 -05:00
LetterJay
935ae98f4a Merge branch 'master' into upstream-merge-29839 2017-09-11 18:03:51 -05:00
LetterJay
914cc38a2d Merge pull request #2676 from Citadel-Station-13/upstream-merge-30515 
[MIRROR] Added warnings for ultrasafe and safe security modes
 2017-09-11 17:54:18 -05:00
LetterJay
6816b83a6d Merge pull request #2673 from Citadel-Station-13/upstream-merge-30509 
[MIRROR] num2text the Instances number
 2017-09-11 17:53:54 -05:00
LetterJay
9adcc174b3 Update shuttle.dm 2017-09-11 17:09:44 -05:00
LetterJay
01920e5fea Merge pull request #2661 from Citadel-Station-13/upstream-merge-30220 
[MIRROR] Adds Archaeology Component
 2017-09-11 15:22:59 -05:00
LetterJay
1c757deb5b Merge pull request #2650 from Citadel-Station-13/upstream-merge-30420 
[MIRROR] TGUI interfaces to various smartfridges
 2017-09-11 15:22:49 -05:00
LetterJay
6b25a0e42b Merge pull request #2647 from Citadel-Station-13/upstream-merge-30465 
[MIRROR] Fixes shuttle name on ramming.
 2017-09-11 15:22:36 -05:00
LetterJay
77090bf3c1 Merge pull request #2641 from Citadel-Station-13/upstream-merge-30463 
[MIRROR] Gives admins the ability to show a read only vv window to a player
 2017-09-11 15:22:26 -05:00
LetterJay
ecdb35bb1a Merge pull request #2636 from Citadel-Station-13/upstream-merge-30396 
[MIRROR] Fixes brains counting towards highlander killstreaks
 2017-09-11 15:22:02 -05:00
LetterJay
c46c442896 Merge pull request #2635 from Citadel-Station-13/upstream-merge-30454 
[MIRROR] Gets rid of manual overlay manipulation
 2017-09-11 15:21:43 -05:00
LetterJay
7b157a9a6a Update datumvars.dm 2017-09-11 14:23:15 -05:00
LetterJay
7cdd5eaa02 Update admin.dm 2017-09-11 14:22:23 -05:00
LetterJay
726b86f3a4 Update on_move.dm 2017-09-11 14:18:28 -05:00
LetterJay
d731e6342c fix it. FIX IT. 2017-09-11 14:15:57 -05:00
LetterJay
24dd22aff5 Update components.dm 2017-09-11 14:10:27 -05:00
LetterJay
14aefe2e64 commit 2017-09-11 14:01:42 -05:00
LetterJay
2f10e78ba7 Update on_move.dm 2017-09-11 13:56:28 -05:00
LetterJay
9e0cb0fa7c Update datumvars.dm 2017-09-11 13:53:18 -05:00
LetterJay
447937477e more oopsies 2017-09-11 13:50:49 -05:00
LetterJay
b008cdada0 oopsie woopsie 2017-09-11 13:47:33 -05:00
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
LetterJay
e5aed03bcb all of my HATE 2017-09-10 15:20:58 -05:00
LetterJay
50587ea679 Update tools.dm 2017-09-10 15:18:30 -05:00
LetterJay
c3fed32afb Update prolonging_prism.dm 2017-09-10 15:17:25 -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
3dbfac920a Update weaponry.dm 2017-09-10 11:48:28 -05:00
LetterJay
33f35fe4d2 Update tools.dm 2017-09-10 11:46:34 -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
Jordan Brown
eaeaae7bef Added warnings for ultrasafe and safe security modes (#30515) 2017-09-09 19:39:52 -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
Kyle Spier-Swenson
8e0ef4f38f num2text the Instances number (#30509) 2017-09-09 14:24:24 -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