Commit Graph

23988 Commits

Author SHA1 Message Date
PsiOmega
c39c929db7 Adds a PDA cartridge ejection verb.
The most requested feature.
2015-04-18 18:18:11 +02:00
Chinsky
0206d6db8f Merge pull request #8868 from Jarcolr/patch-2
Fixes #8633
2015-04-18 17:44:22 +03:00
Chinsky
66a686c301 Merge pull request #8869 from Ravensdale/supamattah
Changes SM alerts to Engineering frequency
2015-04-18 17:44:07 +03:00
Chinsky
3819fe8d03 Merge pull request #8747 from Kelenius/ofJarsAndLizards
The return of the jars
2015-04-18 17:01:08 +03:00
Chinsky
9d6ff2f939 Merge pull request #8865 from PsiOmegaDelta/Adminery
Ensures Admin Delete uses qdel.
2015-04-18 16:56:40 +03:00
Chinsky
fb34bd361b Merge pull request #8860 from PsiOmegaDelta/SanityChecks
Ghost-possession sanity checks.
2015-04-18 16:56:36 +03:00
Chinsky
ead0ffdc29 Merge pull request #8853 from PsiOmegaDelta/ModuleStat
Adds Hardsuit Module tab.
2015-04-18 16:56:31 +03:00
PsiOmegaDelta
0b6affb274 Merge pull request #8877 from Jarcolr/patch-3
Fixes #8559
2015-04-18 15:55:45 +02:00
Chinsky
e839135e2c Merge pull request #8890 from PsiOmegaDelta/StillLikeTalkingToAWall
Fixes #8826.
2015-04-18 16:55:21 +03:00
Chinsky
2192e3d77e Merge pull request #8881 from PsiOmegaDelta/NanoPDA
Fixes #8880.
2015-04-18 16:55:12 +03:00
Chinsky
0d77262c69 Merge pull request #8885 from PsiOmegaDelta/EngineerMasterJob
Fixes #7943.
2015-04-18 16:55:06 +03:00
Zuhayr
bc9d1ba38b Merge pull request #8893 from Baystation12/dev-freeze
Dev freeze into dev
2015-04-18 21:50:40 +09:30
Zuhayr
c8b9d93d66 Merge pull request #8892 from Baystation12/master
Master into dev-freeze
2015-04-18 21:45:41 +09:30
PsiOmega
ad92c80045 Fixes #8826.
Fewer walls in the captain's office.
2015-04-18 12:30:01 +02:00
PsiOmega
f5948f8bb6 Fixes #7943.
Access to engineering equipment is now enough to manipulate shield generators.
2015-04-18 11:52:03 +02:00
PsiOmega
67708c6d3b Fixes #8880.
Case of incorrectly sent parameter.
2015-04-18 08:59:49 +02:00
Jarcolr
1cf3fa4c7a Fixes #8559
Device.dmi is where the sunflower icon is, this is targeting dev because it is ahead on master on this file.
2015-04-17 15:55:15 +03:00
Jarcolr
0030ca76af Spans instead of fonts.
Hopefully no typos.
2015-04-17 15:34:37 +03:00
Zuhayr
98756f0966 Merge pull request #8874 from GinjaNinja32/floor_painter
Fixes floor painter solid-dark icon
2015-04-17 18:48:13 +09:30
GinjaNinja32
159dccbfab Fixes floor painter solid-dark icon
Fixes #8873
2015-04-17 03:18:53 +01:00
Kelenius
ec1b6f122c Merge remote-tracking branch 'origin/dev' into ofJarsAndLizards
Conflicts:
	icons/obj/items.dmi
	maps/exodus-1.dmm
2015-04-16 19:17:10 +03:00
Kelenius
0c9eb8a112 Minor jar fixes 2015-04-16 17:30:01 +03:00
Jarcolr
9fda2a2614 Fixes #8633
Hopefully the wording is okay. Targeting dev because this file is ahead on master.
2015-04-16 17:27:57 +03:00
Ravensdale
a1dbfb69c1 Changes SM alerts to Engineering frequency 2015-04-16 07:01:11 -07:00
PsiOmega
d3b000f2cc Ensures Admin Deletes uses qdel.
Ensures that Destroy() is properly called, for types implementing it.
2015-04-16 12:56:24 +02:00
PsiOmega
08fa1193ce Adds Hardsuit Module tab.
Allows one to (de)activate, engage, select and change module charges from the  	"Hardsuit Modules" tab panel.
Basic idea similar to spells.
2015-04-16 08:54:04 +02:00
Zuhayr
fdd041830a Merge pull request #8854 from PsiOmegaDelta/SpookyMovement
Movement fixes.
2015-04-16 15:11:15 +09:30
Zuhayr
7667fff30c Merge pull request #8858 from GinjaNinja32/patch-1b
Fix cryopod moving robots to nullspace instead of deleting
2015-04-16 14:47:36 +09:30
PsiOmega
a6a9cb76e8 Ghost-possession sanity checks.
Adds sanity checks referred to in #8849.
2015-04-15 16:10:36 +02:00
GinjaNinja32
54044859bf Fix cryopod moving robots to nullspace instead of deleting 2015-04-15 14:28:36 +01:00
PsiOmega
2ddf8ecf28 Movement fixes.
Ensures observers use Process_Incorpmove() despite being dead, while disallowing the once living from doing the same.
Ensures incorporeal creatures denied moving unto holy ground don't keep calling more movement code.
2015-04-15 14:21:58 +02:00
Zuhayr
20cfea7813 Merge pull request #8852 from PsiOmegaDelta/AutoGhost
Moving while dead now auto-ghosts you.
2015-04-15 19:59:38 +09:30
Chinsky
3f93454017 Merge pull request #8849 from PsiOmegaDelta/GhostPossess
Allow admins to drag-drop ghosts into mobs.
2015-04-15 12:46:56 +03:00
Chinsky
85808b5c5c Merge pull request #8850 from PsiOmegaDelta/MuzzledCleanup
Allows dead humans to speak, even if muzzled.
2015-04-15 12:46:27 +03:00
Chinsky
51750dec0a Merge pull request #8851 from Zuhayr/dev-freeze
Quickfix for pariahs breaking cuffs.
2015-04-15 12:45:53 +03:00
PsiOmega
d8f1045e53 Moving while dead now auto-ghosts you.
Also removes now redundant incorporeal_move check that's made further up the proc.
2015-04-15 09:19:19 +02:00
Zuhayr
e7188f9062 Merge pull request #8848 from Baystation12/dev-freeze
Dev-freeze into dev
2015-04-15 16:42:22 +09:30
PsiOmega
0d0786dfa1 Allows dead humans to speak, even if muzzled.
Prevents a fate most cruel, at least when the ghost is still possessing its dead body.
2015-04-15 09:06:04 +02:00
Zuhayr
1aee7282ff Quickfix for pariahs breaking cuffs. 2015-04-15 16:30:13 +09:30
PsiOmega
f9b3547e8d Allow admins to drag-drop ghosts into mobs.
This functions the same way as editing the ckey in vv.
Has the same permission check as assume-direct-control.
It requires the admin also be a ghost to avoid conflicts with other drag drop code.
2015-04-15 08:49:00 +02:00
Zuhayr
3d5623b6e9 Merge pull request #8847 from Baystation12/master
Master into dev-freeze
2015-04-15 16:18:47 +09:30
Chinsky
2ed2f82230 Merge pull request #8843 from PsiOmegaDelta/NewTravis
Updates the BYOND compiler version used by Travis.
2015-04-15 02:12:19 +03:00
Chinsky
b94366067a Merge pull request #8840 from PsiOmegaDelta/NanoI
Fixes NanoUI interaction.
2015-04-15 02:12:12 +03:00
Chinsky
7848a1c300 Merge pull request #8815 from PsiOmegaDelta/CultPorting
Ports /tg/vg/'s Nas-Sie remake
2015-04-15 02:12:05 +03:00
PsiOmega
adbbe63203 Updates the BYOND compiler version used by Travis. 2015-04-14 16:18:41 +02:00
Zuhayr
00f6ca5d28 Merge pull request #8836 from PsiOmegaDelta/HighwayToTheDangerZone
Engineering/police tape can now create floor markings.
2015-04-14 23:40:11 +09:30
PsiOmega
516b60962e Merge remote-tracking branch 'upstream/dev' into CultPorting 2015-04-14 15:54:22 +02:00
Chinsky
d408886333 Merge pull request #8837 from Techhead0/voidtank
Voidsuit Examine info.
2015-04-14 16:36:44 +03:00
Chinsky
32534346c7 Merge pull request #8773 from mwerezak/dislocation
Adds dislocating joints using a neck grab
2015-04-14 16:35:24 +03:00
Chinsky
a601c50f08 Merge pull request #8839 from PsiOmegaDelta/PAPs
Camera network refactor - Part 3 - Final
2015-04-14 16:32:14 +03:00