Commit Graph
1636 Commits
Author SHA1 Message Date
KorPhaeronandCitadelStationBot d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
MrROBUSTandCitadelStationBot 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
vuonojenmustaturskaandCitadelStationBot 053b283745 Fixes initialize hints for a fair number of mobs and items 2017-09-11 12:20:19 -05:00
kingofkosmosandCitadelStationBot 63122795f9 Adds missing span-endings 2017-09-11 07:10:09 -05:00
MilitairesandCitadelStationBot 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
ExcessiveUseOfCobblestoneandCitadelStationBot f63a75b137 Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume! 2017-09-10 17:08:36 -05:00
AnturKandCitadelStationBot 5e3e525036 Fixes lockers alt-click 2017-09-10 16:07:31 -05:00
LetterJayandGitHub e5aed03bcb all of my HATE 2017-09-10 15:20:58 -05:00
LetterJayandGitHub 50587ea679 Update tools.dm 2017-09-10 15:18:30 -05:00
LetterJayandGitHub c3fed32afb Update prolonging_prism.dm 2017-09-10 15:17:25 -05:00
LeoandCitadelStationBot 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
LetterJayandGitHub 3dbfac920a Update weaponry.dm 2017-09-10 11:48:28 -05:00
LetterJayandGitHub 33f35fe4d2 Update tools.dm 2017-09-10 11:46:34 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 685c534d88 Merge pull request #2681 from Citadel-Station-13/upstream-merge-30524
[MIRROR] Removes a src.
2017-09-10 09:47:01 -05:00
CitadelStationBotandPoojawa b363dc352f [MIRROR] remove GLOB. (#2683)
* Merge pull request #30540 from p440/blobglob

remove GLOB.

* remove GLOB.
2017-09-10 09:07:18 -05:00
KorPhaeronandCitadelStationBot 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
orangesandCitadelStationBot ee4052eb61 Merge pull request #30524 from ChangelingRain/srcremoval
Removes a src.
2017-09-10 06:02:06 -05:00
Kerbin-FiberandCitadelStationBot d158ec9528 Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter 2017-09-10 03:43:09 -05:00
AnturKandCitadelStationBot 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 BrownandCitadelStationBot eaeaae7bef Added warnings for ultrasafe and safe security modes (#30515) 2017-09-09 19:39:52 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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 BrownandCitadelStationBot 5b61c84df4 Merge pull request #30481 from YPOQ/shuntfix
Placing a robotics factory actually disables shunting
2017-09-08 21:25:28 -05:00
Jordan BrownandCitadelStationBot d60a6729d3 Merge pull request #30504 from YPOQ/windooremagfix
Windoors open when emagged again
2017-09-08 21:22:16 -05:00
Jordan BrownandCitadelStationBot 92b78d3298 [s] Adds a security token to all admin hrefs 2017-09-08 21:16:02 -05:00
orangesandCitadelStationBot 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
ExcessiveUseOfCobblestoneandCitadelStationBot 33f36fd0de Adds Archaeology Component 2017-09-08 10:02:01 -05:00
ArmhulenandCitadelStationBot 0dfe72d77e chainsaws rebalance, but working this time :) 2017-09-08 10:00:47 -05:00
kingofkosmosandCitadelStationBot cf07ead653 Regularizes resisting out of containers 2017-09-08 09:58:34 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
KorPhaeronandCitadelStationBot 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
KorPhaeronandCitadelStationBot b172025e96 Disablers and ions wont burn statues 2017-09-07 10:34:44 -05:00
LetterJayandGitHub 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
kingofkosmosandCitadelStationBot dd27a1850a Adds a message when trying to move while buckled 2017-09-07 10:12:32 -05:00
LetterJayandGitHub 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
ShizCalevandCitadelStationBot 7fb4426011 Fixes swarmers breaking the SM's containment (#30426)
* Fixes swamers breaking the SM

* Switched checks to use get_area
2017-09-07 05:17:51 -05:00
ShizCalevandCitadelStationBot d8a3b87719 Fixes brains counting towards highlander killstreaks 2017-09-07 05:14:39 -05:00
tortellinitonyandCitadelStationBot d73b82cf11 Gets rid of manual overlay manipulation 2017-09-06 23:39:08 -05:00
LetterJay 17db844180 another mirror rebase for the PRMirror being down 2017-09-06 17:32:49 -05:00
LetterJayandGitHub 24a7aa5a9f Merge branch 'master' into upstream-merge-30079 2017-09-06 09:24:23 -05:00
LetterJayandGitHub b2d7ee0e51 Merge pull request #2537 from Citadel-Station-13/upstream-merge-30248
[MIRROR] Changes sql version to check for schema being ahead
2017-09-06 09:23:02 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 2d469c62ef Merge pull request #2617 from Citadel-Station-13/BadMirrorResolve
Bad mirror resolve
2017-09-06 08:59:20 -05:00
PoojawaandGitHub 3ba2f650dd Adds Paradise Sofas (#2623)
* Adds Paradise Sofas

* Actually enable them to be constructed

* Coding standards, sheesh

* am path guder
2017-09-06 07:54:23 -05:00
LetterJay af409af9cf additional files 2017-09-05 16:29:25 -05:00