Commit Graph

5912 Commits

Author SHA1 Message Date
Crazy Lemon
b769147449 Merge pull request #5897 from FlattestGuitar/e20
e20 gets logged now
2016-11-23 13:22:16 -08:00
Crazy Lemon
405fe1bb54 Merge pull request #5842 from Fox-McCloud/reagent-reorganization
Reagent Reorganization
2016-11-21 16:54:41 -08:00
Mieszko Jędrzejczak
7874bba921 e20 get logged 2016-11-20 01:42:22 +01:00
KasparoVy
0b23981f1b Fix.
The spawnable DNA Injectors containing powers (XRay, etc.) will now
activate/deactivate the powers correctly.
2016-11-19 18:29:43 -05:00
TheDZD
220ed7b27b Merge pull request #5872 from Fox-McCloud/bsa
BSA Tweaks
2016-11-13 20:27:27 -05:00
TheDZD
9807576359 Merge pull request #5875 from Fox-McCloud/vision-fix
Fixes Simple Mobs Attacking Pods/Mechs Across Z-Levels
2016-11-13 19:52:24 -05:00
Fox McCloud
922091d786 Merge pull request #5885 from Markolie/grammarfix
Grammar fix
2016-11-13 19:00:21 -05:00
Markolie
f5c9ebc068 Grammar fix 2016-11-14 00:22:24 +01:00
TullyBurnalot
1955f86383 Fax Guide Removal
- Removes Fax Guides from HoS and HoP Lockers
2016-11-12 01:59:21 +00:00
Fox-McCloud
55ffd16db8 Fixes Telekinetic Simple Mobs 2016-11-11 10:39:50 -05:00
Fox-McCloud
fcc20ac6bc BSA Tweaks 2016-11-09 22:36:03 -05:00
Crazylemon64
6ec712df8c Fixes defib leaving people in deadchat, n2o paralyse time 2016-11-06 21:36:24 -08:00
Fox-McCloud
61da53cca1 create reagents proc 2016-11-06 14:37:47 -05:00
Fox McCloud
911fa70e1a Merge pull request #5601 from Crazylemon64/status_effect_overhaul
Ports over the status effect unification from the extreme refactor
2016-10-30 22:40:24 -04:00
Fox McCloud
c3857dc865 Merge pull request #5819 from Markolie/ezfix
Fixes
2016-10-27 11:44:08 -04:00
Fox McCloud
66027032a4 Merge pull request #5821 from Markolie/ertfixes
ERT fixes
2016-10-27 10:30:23 -04:00
Markolie
a77b501ebf Runtime fix 2016-10-27 15:03:07 +02:00
Markolie
4dcb46d295 More minor briefcase changes 2016-10-27 15:00:31 +02:00
Markolie
e9dc5b1b1f Fix secure briefcases appearing empty 2016-10-27 14:56:58 +02:00
Markolie
f27f72e61b ERT fixes 2016-10-26 03:05:51 +02:00
Markolie
1c89bcb28e Fix spiderling remains being draggable 2016-10-25 18:43:06 +02:00
Fox McCloud
5fb35e7b23 Merge pull request #5809 from Markolie/idchecks
Fix up a number of ID checks
2016-10-24 15:52:01 -04:00
Fox McCloud
45ba4d157a Merge pull request #5416 from KasparoVy/tail_markings_mark2
Marking Refactor, Adds tail markings + Alt heads + Secondary (F)Hair themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
2016-10-23 19:29:54 -04:00
Crazylemon64
6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
Markolie
79be3ca8cf Fix up a number of ID checks 2016-10-23 15:49:02 +02:00
TheDZD
062a14f2af Merge pull request #5795 from Fox-McCloud/null-rod-cleanup
Nullrod istype Helpers
2016-10-22 09:35:16 -04:00
Markolie
3acde653d2 Fix cult girder layer 2016-10-21 18:04:00 +02:00
Markolie
1a307cd8c9 Identity theft objective set fix, tank examine fix, proccall null return fix 2016-10-21 17:51:38 +02:00
Markolie
7173a8fe9f Fix aliens double attacking, tank examining and ATM security level 0 interaction 2016-10-21 17:21:23 +02:00
Markolie
87920451e8 Fix robot lockdown through console and jetpack examine 2016-10-21 17:02:16 +02:00
Fox-McCloud
1da17e6863 Nullrod istype Helpers 2016-10-19 03:09:17 -04:00
Fox McCloud
977d73740f Merge pull request #5780 from Bone-White/master
Fix for issue #5768
2016-10-17 19:16:21 -04:00
Bone White
b40f37444c Fix for issue #5768
Correctly un-wields defib paddles when dropping.
2016-10-16 15:36:01 +01:00
Markolie
e60e93e706 Fix light fixture frame progress bar 2016-10-15 12:47:38 +02:00
KasparoVy
3e653a6279 Conflict resolution. 2016-09-26 12:17:35 -04:00
Mieszko Jędrzejczak
8cef21f3fe pais don't gib on wipe 2016-09-26 17:04:34 +02:00
KasparoVy
ffc0083098 bottlefix 2016-09-18 01:06:47 -04:00
Fox McCloud
c56961f6f0 Merge pull request #5642 from Krausus/UniqueIDs
Adds Unique Identifiers with Topic and VV Integration
2016-09-12 15:32:20 -04:00
Fox McCloud
f5e9b7aadf Merge pull request #5665 from LittleBigKid2000/dna-scrambler-fix
Fixes DNA scrambler not having an icon
2016-09-12 15:11:09 -04:00
Fox McCloud
336d37a36f Merge pull request #5624 from Kyep/syndie_radio
Creates Syndicate Team Radio Frequency
2016-09-12 14:36:31 -04:00
GeneralChaos81
c5e9b0514f Redo of clown/mime door fix. 2016-09-12 20:11:54 +10:00
Isaac Erwin
ea826aa949 Fixes DNA scrambler not having an icon 2016-09-11 23:44:27 -04:00
Krausus
d64bf46f12 Topic UID finishing touches 2016-09-08 13:07:14 -04:00
Fox McCloud
20d0674ebf Merge pull request #5606 from FlattestGuitar/kits
Adds Emergency Plasma/Nitrogen Tanks to Medical Storage
2016-09-07 18:44:35 -04:00
Krausus
d146de1dd7 UID mass replace: src=\ref[datum] 2016-09-05 23:12:08 -04:00
Krausus
92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
Kyep
02ffbd084e Creates Syndicate Team Radio Frequency 2016-09-05 03:35:29 -07:00
Fox McCloud
3b2cbcd57c Merge pull request #5619 from CyrusJazzberry/patch-8
Fixes misc grammar and adds new attack messages
2016-09-05 00:08:08 -04:00
Fox McCloud
34acbdda6e Merge pull request #5615 from CyrusJazzberry/patch-6
Adds new violin attack messages
2016-09-05 00:07:42 -04:00
Jazzdoodle
618df20380 Update misc.dm 2016-09-04 15:05:14 -05:00