75335cb30b
PDA can be ctrl-clicked to remove the item in its pen slot ( #38577 )
...
* Makes pens ez to remove from pda
Players can now ctrl click on the PDA to remove the pen without having to remove the ID first.
* added instructions when examined.
Like how it tells the user they can use alt-click to remove contents, it now says they can use ctrl-click to remove items from the pen slot.
* PDA can now be dragged without dropping the pen.
When ctrl-clicked it now checks to see if the PDA is on a turf and will only output the pen if its not.
* quick change to examine text.
* comma
* Improved the examine
2018-06-19 09:49:36 -05:00
5f20c052c0
Automatic changelog generation for PR #7183 [ci skip]
2018-06-19 09:40:15 -05:00
a385f9e76f
Merge pull request #7183 from Citadel-Station-13/deathride58-patch-1
...
Fixes a merge conflict
2018-06-19 09:40:11 -05:00
7150c207aa
Fixes a merge conflict
2018-06-19 07:30:52 -04:00
1438afa013
Automatic changelog generation for PR #7177 [ci skip]
2018-06-18 22:01:44 -05:00
e448002390
Merge pull request #7177 from Citadel-Station-13/upstream-merge-38555
...
[MIRROR] Dsay now shows admin rank instead of ADMIN
2018-06-18 22:01:42 -05:00
861c5cdcc1
Merge pull request #7176 from Citadel-Station-13/upstream-merge-38556
...
[MIRROR] Makes a thing use its macro
2018-06-18 22:01:26 -05:00
c9eb0d98d9
Automatic changelog generation for PR #7172 [ci skip]
2018-06-18 22:00:44 -05:00
12876c7252
Merge pull request #7172 from Citadel-Station-13/upstream-merge-38553
...
[MIRROR] Allow admin ghosts to use .p and .d say prefixes
2018-06-18 22:00:41 -05:00
4577b9ebbb
Automatic changelog generation for PR #7171 [ci skip]
2018-06-18 22:00:15 -05:00
7a4aad91cb
Merge pull request #7171 from Citadel-Station-13/upstream-merge-38552
...
[MIRROR] Fix gulag shuttle moving instantly
2018-06-18 22:00:13 -05:00
b7047f0489
Merge pull request #7170 from Citadel-Station-13/upstream-merge-38558
...
[MIRROR] Replaces names in plasmaman.txt
2018-06-18 22:00:00 -05:00
507422de14
Automatic changelog generation for PR #7162 [ci skip]
2018-06-18 21:58:43 -05:00
7ab66531bf
Merge pull request #7162 from Citadel-Station-13/upstream-merge-38539
...
[MIRROR] Adds New Shuttle Chairs
2018-06-18 21:58:42 -05:00
50da00b26c
Merge pull request #7161 from Citadel-Station-13/upstream-merge-38540
...
[MIRROR] Cleans up supermatter related varedits
2018-06-18 21:58:15 -05:00
c055bfc9d3
Merge pull request #7175 from Citadel-Station-13/upstream-merge-38581
...
[MIRROR] Fixes failing tools/dependencies builds succeeding the entire build
2018-06-18 21:55:48 -05:00
cc36aa378d
Dsay now shows admin rank instead of ADMIN
2018-06-18 19:17:56 -05:00
cf96c7dd11
Dsay now shows admin rank instead of ADMIN ( #38555 )
...
* Dsay now shows admin rank instead of ADMIN
* All caps to protect the dongs of our admemes
2018-06-18 19:17:55 -05:00
debe1cd972
Makes a thing use its macro
2018-06-18 19:16:44 -05:00
99fee78179
Makes a thing use its macro ( #38556 )
2018-06-18 19:16:43 -05:00
af414d7d4b
Fixes failing tools/dependencies builds succeeding the entire build
2018-06-18 15:27:37 -05:00
aeb047d33f
Fixes failing tools/dependencies builds succeeding the entire build ( #38581 )
2018-06-18 15:27:37 -05:00
8fd79f9912
Automatic changelog generation for PR #7148 [ci skip]
2018-06-18 13:54:01 -05:00
aee56b1f3d
lets dogborg tongues reduce firestacks when they lick faces ( #7148 )
2018-06-18 11:53:59 -07:00
db25067491
adds missing /'s at the starts of some obj instances ( #7169 )
2018-06-18 11:53:33 -07:00
75def268a6
Automatic changelog generation for PR #7165 [ci skip]
2018-06-18 13:53:16 -05:00
7593a2b931
Fixes airless turfs in catgirl containment facility ( #7165 )
2018-06-18 11:53:14 -07:00
27b6ebc612
Cw's Spaceruins, Maintbar and Kegspawn changes ( #7141 )
...
* Station Changes
-Added Jukebox to: Box (maintbar), Meta (maintbar), Pubby (maintbar),
and Omega (maintarcade)
-Added keg spawn to Pubby
-Removed Legcuffs and Rifle Stock from Box maintbar (people were unhappy
with the fact these were sprited identically to handcuffs, will re-add
if someone ports Virgo's legcuffs)
* Space Ruins Changes
-Added KinkMates to SpaceHotel
-Swapped riot helmet for AI detecting multitool on TurretedOutpost
-Changed the loot for oldAIsat to not have a suspicious toolbox, instead
having a toolbelt and combat gloves
* Kegspawn Change
Changed Spawn Rate of kegs to:
-50% mead (5 in 10 instead of 5 in 8)
-20% aphro (2 in 10 instead of 1 in 8)
-20% strong aphro (2 in 10 instead of 1 in 8)
-10% pan galactic gargle blaster (1 in 10 instead of 1 in 8)
* Small MetaStation Fixes
Fixed bug reported by Nethaufer (Zig)#5868 on discord, there was a wire
(and an air supply pipe) accidentally deleted.
2018-06-18 11:52:11 -07:00
03a22ca16d
[MIRROR] Transit space refactor ( #7130 )
...
* Transit space refactor
* Update bitfields.dm
2018-06-18 11:51:02 -07:00
69504f68ce
Allow admin ghosts to use .p and .d say prefixes
2018-06-18 13:16:06 -05:00
684ceb2125
Merge pull request #38553 from AutomaticFrenzy/patch/aghost-saymode
...
Allow admin ghosts to use .p and .d say prefixes
2018-06-18 13:16:06 -05:00
57f76091cc
Fix gulag shuttle moving instantly
2018-06-18 13:13:35 -05:00
4ad2dd22ef
Merge pull request #38552 from AutomaticFrenzy/patch/labor-shuttle
...
Fix gulag shuttle moving instantly
2018-06-18 13:13:35 -05:00
ef120f38ea
Replaces names in plasmaman.txt
2018-06-18 13:12:21 -05:00
4a233caf74
Merge pull request #38558 from erwgd/permanentchemnames
...
Replaces names in plasmaman.txt
2018-06-18 13:12:21 -05:00
389e9584a3
Merge pull request #7167 from Citadel-Station-13/upstream-merge-38521
...
[MIRROR] Fix protolathe in Pubby circuit lab
2018-06-18 12:30:52 -05:00
0cb7361eb8
Automatic changelog generation for PR #7166 [ci skip]
2018-06-18 12:30:29 -05:00
81b88d0d85
Merge pull request #7166 from Citadel-Station-13/upstream-merge-38543
...
[MIRROR] Fix non-secure windoors not supporting One Required access mode
2018-06-18 12:30:26 -05:00
d1f9716101
Automatic changelog generation for PR #7164 [ci skip]
2018-06-18 12:29:56 -05:00
34254116bc
Merge pull request #7164 from Citadel-Station-13/upstream-merge-38527
...
[MIRROR] Fix ripples appearing too broadly and disappearing too soon
2018-06-18 12:29:54 -05:00
43cfea2cb4
Automatic changelog generation for PR #7160 [ci skip]
2018-06-18 12:28:44 -05:00
fb53413ded
Merge pull request #7160 from Citadel-Station-13/upstream-merge-38270
...
[MIRROR] [READY] advanced foam extinguisers [READY]
2018-06-18 12:28:42 -05:00
119fb6abf6
Merge pull request #7159 from Citadel-Station-13/upstream-merge-38542
...
[MIRROR] Some minor cleanup to RegisterSignal
2018-06-18 12:28:11 -05:00
e79c48256c
Automatic changelog generation for PR #7158 [ci skip]
2018-06-18 12:27:47 -05:00
6d74717b39
Merge pull request #7158 from Citadel-Station-13/upstream-merge-38533
...
[MIRROR] Adds dance machine, drink dispensers, flavor to beach bum ruin
2018-06-18 12:27:45 -05:00
83acec5051
Automatic changelog generation for PR #7157 [ci skip]
2018-06-18 12:23:05 -05:00
29ae18fb1a
Merge pull request #7157 from Citadel-Station-13/upstream-merge-38461
...
[MIRROR] Fixes the Blob being banished to the shadow realm
2018-06-18 12:23:03 -05:00
33b8ea8475
Merge pull request #7155 from Citadel-Station-13/upstream-merge-38536
...
[MIRROR] Update node dependencies
2018-06-18 12:19:50 -05:00
ea007a5f36
Automatic changelog generation for PR #7154 [ci skip]
2018-06-18 12:18:34 -05:00
62490e07a8
Merge pull request #7154 from Citadel-Station-13/upstream-merge-38551
...
[MIRROR] Fix item fortification scrolls stacking
2018-06-18 12:18:30 -05:00
Irafas