Commit Graph

3869 Commits

Author SHA1 Message Date
LetterJay
ff17626ce7 Update death.dm 2017-09-11 13:09:30 -05:00
LetterJay
489b2c6deb Update objective_items.dm 2017-09-11 13:08:35 -05:00
LetterJay
26c6f5cc14 Update pinpointer.dm 2017-09-11 13:07:35 -05:00
LetterJay
052fdb70ea Update nuclearbomb.dm 2017-09-11 13:06:27 -05:00
LetterJay
6a47a7011a Update nuclear.dm 2017-09-11 13:05:22 -05:00
LetterJay
48e71cfbd5 Update Malf_Modules.dm 2017-09-11 13:04:28 -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
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