Commit Graph

31519 Commits

Author SHA1 Message Date
variableundefined
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
joep van der velden
713ff0f6b3 != damnit 2019-03-17 14:41:53 +01:00
joep van der velden
675ef68422 uses move resist now 2019-03-17 14:41:31 +01:00
joep van der velden
9eef7fe1f7 no fastmos for the dview 2019-03-17 13:48:16 +01:00
variableundefined
570678a41f Merge pull request #10896 from Jazz23/Xenobio-Addition
Xenobio TG port
2019-03-17 20:36:16 +08:00
variableundefined
f6927792ea Merge pull request #10953 from AffectedArc07/prisonconsole-fixed
Prisonconsole fixed
2019-03-17 19:23:17 +08:00
joep van der velden
288f52bbaf added the canmove 2019-03-17 11:34:05 +01:00
joep van der velden
34cdc1dceb removes the force movement of dview 2019-03-17 11:25:02 +01:00
joep van der velden
1131133d59 Confirmation 2019-03-17 10:17:39 +01:00
variableundefined
c7b560f842 Merge pull request #11045 from Kyep/ventcrawl_buckle
Fixes buckled ventcrawl
2019-03-17 15:23:16 +08:00
AffectedArc07
ce34a6ccb1 Merge branch 'master' into prisonconsole-fixed 2019-03-16 17:54:31 +00:00
variableundefined
efa369162c Merge pull request #10853 from Ty-Omaha/ssd-miasma
SSD Miasma
2019-03-16 09:22:46 +08:00
Kyep
ca773c32dc Fixes ventcrawl while buckled to something 2019-03-15 03:33:48 -07:00
variableundefined
66eddce16c Merge pull request #11024 from Arkatos1/Guardian_Intent_UI
Adds action intent UI for Guardians [Now with custom icons]
2019-03-15 11:27:03 +08:00
variableundefined
3285eae748 Merge pull request #11023 from Couls/defib-text
Defibrillator QoL
2019-03-15 11:25:25 +08:00
variableundefined
9d821534a5 Merge pull request #10845 from Quantum-M/bureaucraticUpdate
Updates stamps and adds contract sprites.
2019-03-14 15:04:40 +08:00
variableundefined
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
variableundefined
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
Aurorablade
238b73121f Asset logging 2019-03-14 00:42:17 -04:00
Arkatos1
840929e0a8 Custom icons for Guardian action intents! 2019-03-13 19:23:27 +01:00
variableundefined
a9e69906a2 Merge pull request #11028 from Couls/simple-animal-text-fix
Simple mobs text fix
2019-03-13 08:23:02 +08:00
Couls
b89c3dd6cf Tcomms no longer translates emotes! 2019-03-12 19:42:15 -04:00
Couls
379735e899 Consistency fixes 2019-03-12 18:58:50 -04:00
Couls
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
Arkatos1
f38f1a0a81 Adds intent UI for guardians 2019-03-12 16:14:07 +01:00
Couls
2f23d50740 Make text blue 2019-03-11 21:44:32 -04:00
Couls
7b08f73b25 Add a line about ctrl-clicking 2019-03-11 20:51:12 -04:00
Arkatos1
5953eed5bc Fixes issue when no antaghud icon was shown for traitor vampire and traitor changeling 2019-03-11 19:25:19 +01:00
rb303
2db1ea7e34 Fix conflicts 2019-03-11 03:04:47 +00:00
rb303
f1716ed14a fixes conflicts 2019-03-11 02:55:21 +00:00
Couls
4e1e55b9e9 Fix spacing errors 2019-03-10 18:00:49 -04:00
Couls
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
variableundefined
bd87257e73 Merge pull request #11012 from Tails2091/simple-help
Adds Missing simple_animal Emote Help Text
2019-03-10 09:07:51 +08:00
Tails2091
8eadbdcd59 Adds missing simple_animal help text 2019-03-09 17:57:05 -05:00
variableundefined
62412c1611 Merge pull request #11006 from Kyep/mystery_antags
Event Role Feature
2019-03-09 22:17:05 +08:00
variableundefined
c217f3a8a9 Merge pull request #10996 from Couls/toggle_karma2
[Ready to Merge]Toggle Karma
2019-03-09 21:40:16 +08:00
variableundefined
9dd9799e50 Merge pull request #10975 from AffectedArc07/autoadmin
Auto admin for localhost
2019-03-09 21:32:43 +08:00
AffectedArc07
ca5f456f79 whoops 2019-03-09 10:31:37 +00:00
AffectedArc07
cf39d5e96e Left my comments in whoops 2019-03-09 10:31:37 +00:00
AffectedArc07
13c26d716c Uses a list instead of world search 2019-03-09 10:31:36 +00:00
AffectedArc07
8bef0cd2e2 Adds in cell management console 2019-03-09 10:31:35 +00:00
variableundefined
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
Ty-Omaha
d89e62df67 update 2019-03-08 18:20:25 -05:00
Kyep
24b562b349 starts using a custom 'E' icon for 'event role' 2019-03-08 11:41:08 -08:00
rb303
26bcfacf2a Fluff Item 2019-03-08 17:49:34 +00:00
variableundefined
c514b4e34a Merge pull request #10991 from Dave-TH/medbay_qol
Smartfridges Accept IV Bags
2019-03-08 22:41:45 +08:00
variableundefined
3088eff926 Merge pull request #10990 from AzuleUtama/cyberImplantNukeFix
Cyber implant bundle fix and Discount balancing
2019-03-08 22:31:14 +08:00
variableundefined
c8a8b2218d Merge pull request #10981 from Kyep/spider_venom
Reworks Giant Spider Venom
2019-03-08 22:28:13 +08:00
variableundefined
c3de57a13f Merge pull request #10973 from Jazz23/Potion-Fix
Adds mousedrop to speed/fire potions
2019-03-08 22:27:16 +08:00
variableundefined
3d0667a1f7 Merge pull request #10988 from Jazz23/Golem-Fix
Removes golem shell after species swap
2019-03-08 22:14:16 +08:00