Tayyyyyyy
8d512e7554
Inline incapacitated check
2017-04-22 22:05:53 -05:00
Tayyyyyyy
53bff427f7
Prevent incapacitated people from using space pod verbs
2017-04-21 23:37:44 -05:00
Mark van Alphen
d786a78e2e
Merge branch 'master' into findnreplace
2017-04-19 20:41:05 +02:00
Fox McCloud
52068755d2
Merge pull request #7117 from IK3I/Chaplain-Fix
...
Adds Equip call for Chaplain's Bible
2017-04-19 05:57:42 -04:00
Fox McCloud
e8624b07f0
Merge pull request #7127 from Xantholne/CMOSkirtFix
...
Fixes Missing CMO Skirt
2017-04-19 05:20:48 -04:00
Xantholne
56f4b1ca7a
Fixes missing CMO Skirt path
2017-04-18 23:35:55 -06:00
Crazy Lemon
18ffff09f4
Merge pull request #7026 from warior4356/Virtual-Avatars
...
VR Phase #1
2017-04-18 21:25:35 -07:00
Warior4356
acb31233e0
qdel added to console and return to roundstart
2017-04-18 02:22:51 -07:00
Crazy Lemon
35261c8e58
Merge pull request #7119 from Krausus/TheyreBiggerOnTheInside
...
Fixes missing storage limitations on matchboxes
2017-04-17 20:01:23 -07:00
Warior4356
d695d4e82a
Status Proc changes.
2017-04-17 17:52:39 -07:00
Fox McCloud
fa09b058d4
Merge pull request #7114 from KasparoVy/gemk-fix
...
GEMK Injector Fix
2017-04-17 03:11:54 -04:00
Krausus
4572ad6af4
Fixes matchboxes lacking storage limitations
2017-04-16 22:53:03 -04:00
Kyep
1d3de58510
Removes Obj & Turf reactions from Plasma Dust
...
🆑 Kyep
rscdel: Plasma dust no longer creates plasma gas on objects or turfs
during reactions.
/🆑
2017-04-16 18:24:03 -07:00
KasparoVy
dfeee91420
GEMK Injector Fix
...
I forgot to include this in the PR I wrote that added the 6 new UI
blocks. Woops!
Anyway, this fixes the GEMK injector.
This also fixes a bug where injecting yourself with a UI that affects
eye colour (i.e. GEMK) wouldn't actually change your eye colour unless
you injected yourself twice (to proc UpdateAppearance a second time,
when really all you needed was update_eyes to be called).
2017-04-16 19:56:19 -04:00
Fox McCloud
84885f1efa
Merge pull request #7007 from uraniummeltdown/glass
...
Heat Proofing Glass Airlocks
2017-04-16 17:55:10 -04:00
Fox McCloud
071b187268
Merge pull request #7097 from KasparoVy/sechaircol_genefix
...
Adds Secondary (Facial) Hair Colours to Genome
2017-04-16 17:50:07 -04:00
Fox McCloud
db18224eb0
Merge pull request #7090 from ZomgPonies/superheroes2
...
Superheroes update
2017-04-16 17:48:52 -04:00
Fox McCloud
ecba9d432f
Merge pull request #7099 from FlattestGuitar/floofpocalypse
...
Fluffpocalypse 🎉
2017-04-16 17:47:39 -04:00
Crazy Lemon
8aa8aeaa20
Merge pull request #7105 from KasparoVy/scream_at
...
Adds Targeting to Some Emotes, Cleans up Emotes Backend
2017-04-16 11:29:48 -07:00
Mieszko Jędrzejczak
22a753957d
Conflicts!
2017-04-16 19:21:20 +02:00
Crazy Lemon
c04e0634f8
Merge pull request #6867 from FalseIncarnate/potato
...
Collaborators are no longer clueless about Syndicate
2017-04-16 10:12:15 -07:00
Warior4356
78af5f62b9
Forgot to save
2017-04-15 22:38:28 -07:00
IK3I
ce0adc54d9
Adds Equip call for Chaplain's Bible
2017-04-15 15:07:46 -05:00
FlattestGuitar
8978f1e530
Fluffpocalypse
2017-04-15 22:05:15 +02:00
KasparoVy
e349153c54
OOPs. Trims unnecessary code, some small fixes
...
Cuts down on copypasta code by implementing a param handling proc in
code\modules\mob\emote.dm.
2017-04-14 21:55:20 -04:00
KasparoVy
080dd90721
Adds some Targeting to Emotes, Tidies up
...
You can wink, buzz2, scream, smile, shake head, wave, nod and snap fingers at people now.
2017-04-14 21:01:23 -04:00
Markolie
d9653c79f5
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace
...
# Conflicts:
# code/game/machinery/recharger.dm
# code/game/objects/items/devices/autopsy.dm
# code/game/objects/items/devices/modkit.dm
# code/game/objects/structures/lattice.dm
2017-04-14 18:15:12 +02:00
Xantholne
b4044b7dd7
Changes beret color to a medical doctor uniform white. Removes certain jobs that probably wouldn't be given one as well. Also updates the flavor text to not be about a blue beret.
2017-04-14 08:13:42 -06:00
Warior4356
866cec8a5c
Requested changes completed
2017-04-14 01:16:13 -07:00
KasparoVy
fa2d5fc3f3
Adds Secondary (Facial) Hair Colours to Genome
2017-04-13 23:09:09 -04:00
Xantholne
991f331aaf
Adds Medical beret available via loadout
2017-04-12 23:50:07 -06:00
ZomgPonies
286a9261b6
Spacing fixes
2017-04-11 20:49:18 -04:00
ZomgPonies
d328af331f
Switched Stun to Slowed
2017-04-11 20:05:35 -04:00
ZomgPonies
06ba71d003
Superheroes update
2017-04-11 19:53:08 -04:00
Fox McCloud
e9156ef71b
Merge pull request #7036 from FlattestGuitar/desolate-fluff
...
Adds a fluff item for DesolateG 👌
2017-04-11 19:52:14 -04:00
Fox McCloud
0edc5400b3
Merge pull request #7080 from SamHPurp/loyalty-to-mindshield
...
Refactors any remaining Loyalty references to Mindshield
2017-04-11 19:50:59 -04:00
Fox McCloud
be2ceef4ab
Merge pull request #7068 from FalseIncarnate/bugfix
...
[s] Shadowling "Extend Shuttle" prevents recall
2017-04-11 18:53:37 -04:00
Fox McCloud
14a2df684b
Merge pull request #7071 from TravellingMerchant/kidanemote
...
Adds Kidan specific emotes.
2017-04-11 18:51:38 -04:00
FlattestGuitar
c73eb10c1b
Adds a fluff item for DesolateG
2017-04-12 00:41:20 +02:00
Crazy Lemon
2df2b1f5c7
Merge pull request #7081 from FlattestGuitar/misclick
...
Removes pre-confirmation check from karma gifting 👮
2017-04-11 00:18:35 -07:00
Crazy Lemon
82312a4424
Merge pull request #7069 from TravellingMerchant/TravellingMerchant-patch-2
...
Minor "bug" fixes. (Kidan changes.)
2017-04-09 18:33:45 -07:00
Sam
e291a7ec6f
Fixes 7082
2017-04-10 01:10:20 +01:00
Crazy Lemon
ff271f7b29
Merge pull request #7061 from Fox-McCloud/damn-cells
...
Damn cells
2017-04-09 13:55:30 -07:00
Crazy Lemon
cc649db525
Merge pull request #6894 from Fox-McCloud/abductor-hearts
...
Abductor Gland Rework and Abductor Updates
2017-04-09 13:40:01 -07:00
FlattestGuitar
24e9fbc507
Removes pre-confirmation warning from karma gifting.
2017-04-09 22:35:53 +02:00
Sam
932cae0224
Loyalty implant -> Mindshield Implant
2017-04-09 16:50:51 +01:00
TravellingMerchant
a53af728ae
Defines the new Kidan Emotes
2017-04-08 11:37:01 +01:00
TravellingMerchant
5a56b44c00
Allows Kidan to use underwear & undershirt, adds new suicide messages.
2017-04-07 21:43:40 +01:00
TravellingMerchant
41f755563e
Changes Kidans colour-able antenna value from 0 to 1.
...
Lets the Kidans
2017-04-07 21:39:46 +01:00
FalseIncarnate
971cc07d04
Shadowling "Extend Shuttle" prevents recall
...
The Shadowling ability "Extend Shuttle" now prevents the shuttle from
being recalled.
- The announcement when the ability is successful now also informs the
crew of this inability to recall.
Additionally, attempts to recall a shuttle which cannot be recalled due
to the canRecall var will no longer be logged since they don't succeed.
2017-04-07 02:43:01 -04:00
