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

2399 Commits

Author SHA1 Message Date
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
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
AnturK
1553e26fe2 I missed that in last fix. (#30590) 2017-09-11 14:37:22 -05:00
LetterJay
726b86f3a4 Update on_move.dm 2017-09-11 14:18:28 -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
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
LetterJay
6951e39d13 Update apc.dm 2017-09-11 13:10:54 -05:00
LetterJay
c1872907b1 Update robot_modules.dm 2017-09-11 13:10:18 -05:00
LetterJay
ff17626ce7 Update death.dm 2017-09-11 13:09:30 -05:00
KorPhaeron
d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
KorPhaeron
bdf08037ff Magic Ladder 2017-09-11 12:39:16 -05:00
BeeSting12
9e83717c92 Spetsnaz Pyro Bundle Rebalance (#30564) 
* im gay

* oops did a thing wrong

* wew
 2017-09-11 12:32:58 -05:00
AnturK
19adbb9a32 Fixes ventriloquist dummy (#30584) 2017-09-11 12:32:49 -05:00
MrROBUST
2812a72cca Mechs now can be connected to atmos ports (#30551) 
* Mechs now can be connected to atmos ports

* Using internal_tank instead of dead code.

* Apply Cyberboss's advises

Corrected stupid typos

* Broke connection if external powers move mech

Remove forgotten comment

* get_turf(src)
 2017-09-11 12:25:33 -05:00
vuonojenmustaturska
053b283745 Fixes initialize hints for a fair number of mobs and items 2017-09-11 12:20:19 -05:00
kevinz000
9b0e43f7c3 Adds a few SDQL2 list wrappers (#30574) 
* Update SDQL_2_wrappers.dm

* Update SDQL_2_wrappers.dm

* Update SDQL_2_wrappers.dm
 2017-09-11 12:19:07 -05:00
kingofkosmos
63122795f9 Adds missing span-endings 2017-09-11 07:10:09 -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
Militaires
3aec72d4f4 Adds Gondoland and the rare Gondolas (#30530) 
A strange race of bear-like beings consisting of a head placed DIRECTLY on a pair of legs, their fur sells for extremely high prices.

The gondoland asteroid is the last natural habitat for these rare creatures.
 2017-09-10 17:10:45 -05:00
ExcessiveUseOfCobblestone
f63a75b137 Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume! 2017-09-10 17:08:36 -05:00
LetterJay
b89fa8ab15 Update topic.dm 2017-09-10 15:54:31 -05: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
Leo
cb734046f7 Changes golem shell attackby istype chain to use an assoc list instead of an istype chain (#30542) 
* Changes golem shell attackby istype chain to use an assoc list instead

* Makes the check use merge_type as opposed of item type
 2017-09-10 14:18:25 -05:00
KorPhaeron
134c3f5f39 Losebreath 2017-09-10 12:37:29 -05:00
Leo
0e24ac55a5 Merge pull request #30558 from Cyberboss/IFUCKINGHATETHISGODAMNSTUPIDASSFILE 
Adds href tokens to topic.dm
 2017-09-10 09:35:21 -05:00
oranges
adc85f0edc In which smartfridge ui_data is called only when needed, and a minor display bug involving drying racks is fixed 2017-09-10 06:00:52 -05:00
Kerbin-Fiber
d158ec9528 Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter 2017-09-10 03:43:09 -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
KorPhaeron
8a297a3a9c People in soft crit will leave blood trails when dragging themselves/Will take less damage in soft crit 2017-09-09 21:07:34 -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
AnturK
dc2c9fb07d Fixes admin topics 2017-09-09 17:13:25 -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
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
Jordan Brown
92b78d3298 [s] Adds a security token to all admin hrefs 2017-09-08 21:16:02 -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
ExcessiveUseOfCobblestone
33f36fd0de Adds Archaeology Component 2017-09-08 10:02:01 -05:00