d5be3018c1
Merge pull request #9353 from Firecage/Pickupverb
...
Allows you to pick up stuff with the verb while buckled.
2015-05-13 19:41:53 +10:00
bd12598404
Merge pull request #9376 from spasticVerbalizer/stackingFalseWalls
...
Adds check to prevent false wall stacking, fixes #6449
2015-05-11 00:07:11 +10:00
040fd7d8b7
Change uses of 'usr' to 'user', move checking of wall up so the message actually shows
2015-05-10 13:31:10 +02:00
7e0e50302a
Merge pull request #9436 from MrStonedOne/powerfixes
...
Merges power subsystem into machine subsystem.
2015-05-10 08:23:20 +01:00
c6c7237265
Merges power subsystem into machine subsystem.
...
This is to avoid issues from when they fire out of sync, since powernets assume machine's subsystem will fire directly after power's does.
2015-05-09 23:48:18 -07:00
087365e763
src.contents to src.loc.contents
2015-05-09 20:49:44 +02:00
72169da31f
Merge pull request #9409 from GunHog/The_Machine_Spirit_Sings_To_Me
...
Removes mining drill power mechanic.
2015-05-09 19:38:17 +02:00
36be3b6983
Merge pull request #9110 from Xhuis/double_cannons
...
Adds the Pneumatic Cannon
2015-05-09 12:00:45 -05:00
faf6bff92c
Typecheck for turf being a wall, look in contents rather than loc.
2015-05-09 18:58:30 +02:00
7c9667db38
Merge remote-tracking branch 'remotes/upstream/master' into The_Machine_Spirit_Sings_To_Me
2015-05-09 11:40:44 -05:00
4e787fb980
Merge pull request #9358 from Firecage/Weldersprites
...
New welder sprites and welder name, Fix experimental welder.
2015-05-09 11:26:32 -05:00
1875f3a9c2
Merge pull request #9377 from Jordie0608/thebackpackistherealmagicitemhere
...
Group of fixes
2015-05-09 16:23:46 +02:00
9387af3587
Merge pull request #9403 from francinum/patch-1
...
Span Closure
2015-05-09 22:12:04 +10:00
67fe7dc25c
Merge pull request #9396 from Firecage/Nodropmutants
...
Prevents golems and skeletons from dropping due to shards and mousetraps
2015-05-09 22:05:04 +10:00
aafa80dcd8
Merge pull request #9378 from GunHog/diamond_tipped_spirals
...
Fixes the mining borg diamond drill upgrade
2015-05-09 21:45:21 +10:00
54bcdb1b78
Merge pull request #9354 from Firecage/NoAIBuckling
...
Prevents an AI from being buckled.
2015-05-09 21:35:52 +10:00
4e82cd9689
Merge pull request #9355 from Firecage/OverlaycleanBGone
...
Removes the ability to clean Overlays
2015-05-09 21:30:21 +10:00
45b76d4a26
Merge pull request #9337 from xxalpha/ash
...
Fixed a couple of small problems with smoking pipes.
2015-05-09 20:33:00 +10:00
279a2653c6
Merge pull request #9347 from SamuelRowe/master
...
Spelling and grammar fixes *FIXED*
2015-05-09 20:31:54 +10:00
fdeb84021d
Merge pull request #9320 from GunHog/Botcall_V2
...
Bot performance and PDA features update
2015-05-09 06:26:19 +01:00
f0003cd7d4
Merge pull request #9385 from optimumtact/forkingfantastic
...
Fork eating no longer requires mouth zone sel
2015-05-08 15:51:43 -05:00
26df5b6c8e
Removes mining drill power mechanic.
...
- Removes the power mechanic from mining drills and the sonic
jackhammer.
- Fixes broken borg diamond drill upgrade.
2015-05-08 10:12:22 -05:00
489d076de5
Merge pull request #9126 from Jordie0608/doesrussellsteapotapplytorussellsteapot
...
Fixes #9035 , atmos locker sprite and misc logging bug
2015-05-08 16:24:21 +02:00
e71106ad13
Merge pull request #9289 from Xhuis/now_he's_poorly_from_too_much_electric
...
Adds a second functionality to the emagged defibrillator
2015-05-08 22:10:49 +10:00
c9b804f6f6
Merge pull request #9256 from astralenigma/cradesbypaprka
...
Crates are mailed with manifests taped to the outside by paprka Merge Conflict resolution
2015-05-08 22:10:35 +10:00
939ceae37d
Closes the <span> tag
2015-05-07 21:26:31 -04:00
3e540dafdc
Adds D4 to the HARDFEET mix.
2015-05-07 18:43:50 +02:00
1fb8dcecd1
Prevents golems and skeletons from dropping due to shards and mousetraps
2015-05-07 15:44:17 +02:00
d28cd28426
Merge pull request #9315 from kingofkosmos/attackmsgfix
...
Removes unnecessary attack-messages
2015-05-06 22:34:30 -05:00
58c460a361
Fork eating no longer requires mouth zone sel
...
Instead, if there is a fork load you will simply eat the fork load.
2015-05-07 15:13:06 +12:00
5812e63b4a
Merge pull request #9313 from xxalpha/barsign
...
"The Net" barsign
2015-05-06 16:18:31 -05:00
45f2336413
Fixes the mining borg diamond drill upgrade
...
- Made the borg diamond drill upgrade a child of the standard borg
mining drill.
2015-05-06 10:09:57 -05:00
46b2fe33af
Merge pull request #9291 from Ikarrus/gangmind
...
Gang Update
2015-05-06 10:04:26 -05:00
f85b3735bd
group of fixes
2015-05-07 00:40:26 +10:00
95d7af4e48
Merge pull request #9277 from Ikarrus/ertbaton
...
Batons for Light ERP
2015-05-06 09:03:55 -05:00
f49fbf1efc
Merge pull request #9303 from RemieRichards/ExperimentalPerfomancetest
...
Explosion Performance Upgrades
2015-05-06 09:00:42 -05:00
22fd9cc430
Added check to prevent false wall stacking
2015-05-06 15:35:17 +02:00
cd92d28b0b
New welding tools sprites
2015-05-06 13:38:06 +02:00
b8ce5bc7cf
E
2015-05-06 15:31:09 +12:00
f11122c255
Merge pull request #9338 from optimumtact/framingrage
...
Change machine frames and girders deconstruction step
2015-05-05 21:38:02 -05:00
0ebbc811ac
Fixes experimental welding tool
2015-05-05 23:44:46 +02:00
8e79448c11
New sprites and name
2015-05-05 22:30:48 +02:00
c0c2c8b097
cleanable #define
2015-05-05 18:51:44 +02:00
522e77752f
Removes the ability to clean Overlays
2015-05-05 17:36:51 +02:00
13b9e928d7
Prevents an AI from being buckled.
2015-05-05 17:03:53 +02:00
e80e08d552
Allows you to pick up stuff with the verb while buckled.
2015-05-05 15:54:49 +02:00
4ac3497ebe
Change machine frames and girders deconstruction step
...
They now use the screwdriver instead of the welding tool
On top of that I added a check to ensure you can't disassemble the same girder
more than once to farm materials
2015-05-05 10:32:57 +12:00
96ab44536d
Fixed smoking pipe messages. Fixed emptying empty pipes.
...
Improved check.
2015-05-04 22:34:08 +01:00
dfaf90c79e
Merge pull request #9264 from phil235/BundleFix6
...
a group of fixes.
2015-05-04 09:41:01 -05:00
5bbf2be174
Merge pull request #9233 from Firecage/Operatingcuffing
...
Allows you to buckle people to an operating table.
2015-05-04 09:15:41 -05:00
Jordie