024a393fe9
Merge pull request #11057 from farie82/no-more-force-on-dview
...
Should make it so that dview can not bump into alive people anymore
2019-03-17 22:11:50 +08:00
675ef68422
uses move resist now
2019-03-17 14:41:31 +01:00
570678a41f
Merge pull request #10896 from Jazz23/Xenobio-Addition
...
Xenobio TG port
2019-03-17 20:36:16 +08:00
f6927792ea
Merge pull request #10953 from AffectedArc07/prisonconsole-fixed
...
Prisonconsole fixed
2019-03-17 19:23:17 +08:00
1131133d59
Confirmation
2019-03-17 10:17:39 +01:00
c7b560f842
Merge pull request #11045 from Kyep/ventcrawl_buckle
...
Fixes buckled ventcrawl
2019-03-17 15:23:16 +08:00
ce34a6ccb1
Merge branch 'master' into prisonconsole-fixed
2019-03-16 17:54:31 +00:00
efa369162c
Merge pull request #10853 from Ty-Omaha/ssd-miasma
...
SSD Miasma
2019-03-16 09:22:46 +08:00
ca773c32dc
Fixes ventcrawl while buckled to something
2019-03-15 03:33:48 -07:00
9d821534a5
Merge pull request #10845 from Quantum-M/bureaucraticUpdate
...
Updates stamps and adds contract sprites.
2019-03-14 15:04:40 +08:00
6a2067f9c4
Merge pull request #10795 from Quantum-M/alienOrgans
...
[Ready for Review]Adds different looking organs to each species, some blood color changes, and MMI changes
2019-03-14 15:04:29 +08:00
dcd9ea8278
Merge pull request #11030 from Couls/shesi-fluff-fix
...
Update shesi's fluff sprites and add in a custom winter hood
2019-03-14 14:43:48 +08:00
238b73121f
Asset logging
2019-03-14 00:42:17 -04:00
379735e899
Consistency fixes
2019-03-12 18:58:50 -04:00
cc7d2606be
Update shesi's fluff sprites and add in a custom winter hood to go with the coat
2019-03-12 18:24:04 -04:00
2db1ea7e34
Fix conflicts
2019-03-11 03:04:47 +00:00
f1716ed14a
fixes conflicts
2019-03-11 02:55:21 +00:00
4e1e55b9e9
Fix spacing errors
2019-03-10 18:00:49 -04:00
9037aa2d87
Hotfix
...
send proper message about karma gains, display a message about whether it's enabled or not at roundstart for less confusion
2019-03-10 16:05:02 -04:00
bd87257e73
Merge pull request #11012 from Tails2091/simple-help
...
Adds Missing simple_animal Emote Help Text
2019-03-10 09:07:51 +08:00
8eadbdcd59
Adds missing simple_animal help text
2019-03-09 17:57:05 -05:00
62412c1611
Merge pull request #11006 from Kyep/mystery_antags
...
Event Role Feature
2019-03-09 22:17:05 +08:00
c217f3a8a9
Merge pull request #10996 from Couls/toggle_karma2
...
[Ready to Merge]Toggle Karma
2019-03-09 21:40:16 +08:00
9dd9799e50
Merge pull request #10975 from AffectedArc07/autoadmin
...
Auto admin for localhost
2019-03-09 21:32:43 +08:00
ca5f456f79
whoops
2019-03-09 10:31:37 +00:00
8bef0cd2e2
Adds in cell management console
2019-03-09 10:31:35 +00:00
55bf28a402
Merge pull request #10989 from AffectedArc07/discord-verb-movement
...
Moves discord verbs to "Special Verbs" instead of "OOC"
2019-03-09 15:54:18 +08:00
d89e62df67
update
2019-03-08 18:20:25 -05:00
26bcfacf2a
Fluff Item
2019-03-08 17:49:34 +00:00
c514b4e34a
Merge pull request #10991 from Dave-TH/medbay_qol
...
Smartfridges Accept IV Bags
2019-03-08 22:41:45 +08:00
3088eff926
Merge pull request #10990 from AzuleUtama/cyberImplantNukeFix
...
Cyber implant bundle fix and Discount balancing
2019-03-08 22:31:14 +08:00
c8a8b2218d
Merge pull request #10981 from Kyep/spider_venom
...
Reworks Giant Spider Venom
2019-03-08 22:28:13 +08:00
c3de57a13f
Merge pull request #10973 from Jazz23/Potion-Fix
...
Adds mousedrop to speed/fire potions
2019-03-08 22:27:16 +08:00
3d0667a1f7
Merge pull request #10988 from Jazz23/Golem-Fix
...
Removes golem shell after species swap
2019-03-08 22:14:16 +08:00
0b79e58a8e
Merge pull request #10992 from Aurorablade/PSHairFluff
...
Pinapple salad hair fluff
2019-03-08 21:41:02 +08:00
57d9b22675
Eventmob/specialrole v1.0
2019-03-08 02:08:24 -08:00
5d83925223
Revert "Revert "Merge branch 'toggle_karma2' of https://github.com/Couls/Paradise into toggle_karma2""
...
This reverts commit bed368d1c9
2019-03-07 17:43:19 -05:00
bed368d1c9
Revert "Merge branch 'toggle_karma2' of https://github.com/Couls/Paradise into toggle_karma2"
...
This reverts commit 79777f441ea76e7c4060
2019-03-07 17:42:53 -05:00
ddb335fe2c
remove redundant var
2019-03-07 15:45:58 -05:00
389f055a5b
Fixes a pathing format error that i should know better then not to do.
2019-03-06 20:22:02 -05:00
cbc45451bc
Merge pull request #10994 from Agameofscones/lang_key_fix
...
Fixes Neo-Russkiya Lang key
2019-03-07 09:11:36 +08:00
6549234b8c
Merge pull request #10968 from Fox-McCloud/his-grace
...
His Grace Binds His Will
2019-03-07 08:49:05 +08:00
8bc511f50f
Make karma toggleable
...
Add in feedback message
Update client defines.dm
keep it as bool I guess
Update karma.dm
Make it persistent
Update karma.dm
Update karma.dm
Update preferences.dm
make it compile, include kyet's suggestions
fix some things with the help of dtx
2019-03-05 20:26:43 -05:00
23ba90fffc
Initial
...
I broke pls fix
2019-03-05 13:09:40 -08:00
ca629f4bd3
Pinapplehairfluff
2019-03-04 22:10:22 -05:00
ef8142d130
Medbay Smartfridges
2019-03-04 18:57:42 -05:00
a5cd29f17b
Fixed two bugs with the cyber implant bundle, ammo bag and cyber bundle no longer discountable
2019-03-04 19:40:23 +00:00
f9e321fbe2
Moves discord verbs to "Special Verbs" instead of "OOC"
2019-03-04 15:49:10 +00:00
b70f2940b7
Merge pull request #10970 from AffectedArc07/fluff
...
Fluff Item
2019-03-04 22:08:44 +08:00
c12a43913b
Merge pull request #10921 from Nicaragua1/General_Griefsky
...
Genewul Giftskee is less annoying
2019-03-04 19:02:47 +08:00
variableundefined