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

3953 Commits

Author SHA1 Message Date
ExcessiveUseOfCobblestone
f63a75b137 Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume! 2017-09-10 17:08:36 -05:00
AnturK
5e3e525036 Fixes lockers alt-click 2017-09-10 16:07:31 -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
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
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
Leo
44e62d8016 Uplink lock codes now pick from the phonetic alphabet global list (#30538) 
* Uplink lock codes now pick from the phonetic alphabet global list

* Update virus_cart.dm
 2017-09-10 14:17:16 -05:00
KorPhaeron
134c3f5f39 Losebreath 2017-09-10 12:37:29 -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
Leo
0e24ac55a5 Merge pull request #30558 from Cyberboss/IFUCKINGHATETHISGODAMNSTUPIDASSFILE 
Adds href tokens to topic.dm
 2017-09-10 09:35:21 -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
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
Jordan Brown
eaeaae7bef Added warnings for ultrasafe and safe security modes (#30515) 2017-09-09 19:39:52 -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
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
Jordan Brown
92b78d3298 [s] Adds a security token to all admin hrefs 2017-09-08 21:16:02 -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
ExcessiveUseOfCobblestone
33f36fd0de Adds Archaeology Component 2017-09-08 10:02:01 -05:00
Armhulen
0dfe72d77e chainsaws rebalance, but working this time :) 2017-09-08 10:00:47 -05:00
kingofkosmos
cf07ead653 Regularizes resisting out of containers 2017-09-08 09:58:34 -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