Commit Graph

12504 Commits

Author SHA1 Message Date
Razharas eabea41f4d Merge pull request #5989 from Menshin/cables_cutting_fix
Fixes cutting cables always spawning a single red cable
2014-11-23 23:35:21 +03:00
Remie Richards eead810fcc Merge pull request #5875 from phil235/RevolverMalfFix
Fixes the modified detective revolver blowing up with empty chamber
2014-11-23 15:11:28 +00:00
Remie Richards 3011261e7f Merge pull request #5980 from Menshin/collectors_anchoring_fix
Radiations collectors anchoring fix
2014-11-23 15:02:28 +00:00
Remie Richards 5e6d0c9994 Merge pull request #5979 from tkdrg/grabthewood
Fixes wood duplicating exploit with bookcase
2014-11-23 15:00:11 +00:00
Cheridan 2b556b9bab Merge pull request #5871 from Carn/bygex
Interface for using boost::regex in byond.
2014-11-23 01:18:41 -06:00
Cheridan 51b6253315 Merge pull request #5964 from phil235/ViroFix1
Fixing viruses not working.
2014-11-23 00:56:29 -06:00
Cheridan e1b5a6815b Merge pull request #5856 from tkdrg/anotherbrickinthewall
Wall cleanup, attempt #2
2014-11-22 17:04:34 -06:00
Swag McYolosteinen 002ecddba3 Merge pull request #5849 from phil235/SoapMsgFix
Fixes the mouth washing message
2014-11-22 19:08:55 +01:00
phil235 3a97e8d878 Fixes not being able to have more than one virus. (two typos fixed) 2014-11-22 18:30:19 +01:00
Menshin 56bd52e95b Fixed cutting cables always spawning a single red cable 2014-11-22 15:59:18 +01:00
Razharas b26446362f Merge pull request #5821 from Intigracy/onetimeIwokeupinthemiddleofthenightandcouldntgobacktosleepitwaslikesooooowierdandIwassooooootiredalldaylong
fixes #5816 (mimes not spawning with mime backpack if pref =/= backpack)
2014-11-22 17:47:04 +03:00
Razharas faa1dfc09e Merge pull request #5943 from MrPerson/forcewall_when_stunned
Allow casting conjuration spells like forcewall when stunned.
2014-11-22 16:03:30 +03:00
Razharas ebeb3367c2 Merge pull request #5938 from hornygranny/piperuntimes
disposals fixes
2014-11-22 14:50:42 +03:00
tkdrg 64e5f0b6b9 Fixes wood duplicating exploit with bookcase 2014-11-21 20:54:29 -03:00
Menshin c2cfa31d87 Make collectors actually connect to the powernet when wrenched down. 2014-11-22 00:32:52 +01:00
hornygranny dce9dadea2 Merge pull request #5914 from paprka/removewindows
Changes most border windows/firelocks to full tile
Gets paprika killed
2014-11-21 11:47:04 -08:00
Cheridan 6ec91732c8 Merge pull request #5911 from Razharas/MechFix
Microwave message fix, small and lazy
2014-11-21 10:53:09 -06:00
Cheridan 7feaa1cf66 Merge pull request #5934 from paprka/defibbuff
Buffs defibrillator PNR to 5 minutes
2014-11-21 10:30:38 -06:00
Cheridan 0f4a27e271 Merge pull request #5947 from tkdrg/turretai
Fixes AI mouse shortcuts skipping turret control sanity checks
2014-11-21 10:26:22 -06:00
Cheridan 448d0fab7f Merge pull request #5913 from tkdrg/yearslater
Makes cyborg modules NODROP
2014-11-21 10:17:53 -06:00
Cheridan a9199118e5 Merge pull request #5925 from paprka/flashfix
Fixes flashes being useless
2014-11-21 10:14:39 -06:00
paprka 41c86dd557 fixes disarming affecting area stuns 2014-11-21 08:06:07 -08:00
phil235 3d540a0d03 Fixes missing cure_text's, fixes virus being uncurable, fixes advance virus changing upon injection. Fixes virus staying at stage 1. 2014-11-20 20:36:43 +01:00
hornygranny a2785aaaa8 Merge pull request #5949 from tkdrg/borgalarm
Lets borgs interact with air alarm wire panels
2014-11-20 11:21:37 -08:00
hornygranny b2fba4a48f Merge pull request #5944 from Jordie0608/orangeslikesgoatbutts
Fixes select job equipment cancel
2014-11-20 11:21:13 -08:00
Cheridan a1efd6cfde Merge pull request #5946 from tkdrg/tktp
Fixes TK teleporting pictures and growns
2014-11-20 13:05:11 -06:00
tkdrg edf92311cf Lets borgs interact with air alarm wire panels. 2014-11-20 13:41:56 -03:00
Cheridan 0da09e3f6b Merge pull request #5557 from Incoming5643/magicmania1.76
Magic Mania 1.76: Lets outrun the feature freeze
2014-11-20 09:07:41 -06:00
Cheridan 283cd657fe Merge pull request #5955 from Jordie0608/ideletedmyvdibyaccident
Fixes #5951 Uplink implant TC amount description
2014-11-20 08:55:15 -06:00
Cheridan 3c1b446a20 Merge pull request #5916 from Perakp/infiniteAbsorbFix
Little absorb bugfixes
2014-11-20 08:43:19 -06:00
Cheridan 8bfed4258b Merge pull request #5922 from Steelpoint/BeretHoS
HoS Beret + Warden Drill Hat
2014-11-19 10:26:27 -06:00
Jordie 48b60c82a1 Corrects uplink implant desc tc amount 2014-11-19 19:46:06 +11:00
paprka bda5947d30 improves firelocks, window damage, and window deconstruction 2014-11-18 18:25:47 -08:00
Cheridan 1208c48af3 Merge pull request #5652 from Menshin/atmos_z_level_fix
Atmos z level fix + radio controller code sanitization
2014-11-18 17:05:14 -06:00
tkdrg 4ef217cfb3 Fixes AI shortcuts skipping turret sanity checks 2014-11-18 16:25:10 -03:00
Cheridan c98448b5c2 Merge pull request #5650 from phil235/MechAtkFix1
All mechs get a melee attack
2014-11-18 12:53:52 -06:00
tkdrg 0db30a6534 Fixes issues with TK teleporting pictures and harvested plants. 2014-11-18 15:49:03 -03:00
Jordie0608 ce6a1d0d89 Fixes select job equipment cancel 2014-11-18 22:50:33 +11:00
MrPerson 6c5bb53df0 Allow casting conjuration spells like forcewall when stunned.
Fixes #4937
2014-11-17 21:21:01 -08:00
Razharas 87fe5489a7 Merge pull request #5701 from tkdrg/outoftheleftfield
Containment fiels bounce structure, machinery & mechs, take two
2014-11-18 04:39:48 +03:00
Razharas 59aa177af7 Merge pull request #5681 from Menshin/singulo_beacon_fix
Singularity beacon fix and clean-up
2014-11-18 04:19:00 +03:00
Razharas e205c8f2f6 Merge pull request #5857 from paprka/lolnames
Fixes a bunch of capitalization inconsistencies, adds names to vendors
2014-11-18 03:46:26 +03:00
Hornygranny 967689e6dc fixes #5667 remove atmos pipe fix 2014-11-17 14:00:58 -08:00
Menshin 1236f822d6 Conflict solving 2014-11-17 22:38:22 +01:00
Cheridan 5e68e30389 Merge pull request #5874 from phil235/MMIMechaFix
Drones and silicons can no longer enter mechas.
2014-11-17 14:00:09 -06:00
hornygranny 639594c7f9 Merge pull request #5890 from Jordie0608/iwhoopsedalloverit
Fixes #5840 Improves stun baton messages
2014-11-17 11:46:06 -08:00
hornygranny 1111c9caa7 Merge pull request #5915 from tkdrg/hugs
Fixes a couple facehugger bugs
2014-11-17 11:38:57 -08:00
Cheridan 53d913bc7f Merge pull request #5924 from tkdrg/junk
Removes unticked unused code from the tree
2014-11-17 13:34:49 -06:00
Hornygranny 2374eb9720 fixes disposals flushing their stored construct
fixes an atmos runtime
fixes a disposal pipe runtime
2014-11-17 11:30:33 -08:00
Remie Richards 85f735c504 Merge pull request #5878 from phil235/DroneShardFix
Fixes drones cutting their hands when using shards.
2014-11-17 09:55:19 +00:00