ba84046ecc
Pneumatic cannon inhand sprites
2015-05-13 14:57:15 -04:00
ba20b8a265
Merge pull request #9352 from Jordie0608/redefiningwhatitmeanstobeadefine
...
Resolves #1358 , /code/defines/obj.dm reorganization
2015-05-13 09:23:56 -05:00
e854dd146f
Changes welder weight classes.
2015-05-13 13:32:54 +02:00
ec9382c43b
Merge branch 'master' of https://github.com/tgstation/-tg-station into ss13hassomanybugsitcountsasanecosystem
...
Conflicts:
icons/mob/inhands/items_lefthand.dmi
icons/mob/inhands/items_righthand.dmi
2015-05-13 20:01:27 +10:00
a978ee6ba3
Merge pull request #9458 from xxalpha/cyborgtiles
...
Fixed cyborg floor tiles being infinite.
2015-05-13 19:45:45 +10:00
ab16875492
Fixed dualhanded runtime.
2015-05-12 23:55:49 +01:00
0220817b0c
Fix lighter/dropped runtime that happened once.
...
That was no fix. It doesn't need fixing.
2015-05-12 23:45:22 +01:00
e5dfaaf007
Fixed cyborg floor tiles being infinite.
2015-05-11 22:08:16 +01:00
330a24e4f1
Removes unnecessary comma
2015-05-11 16:32:41 -04:00
0ba314552a
The initial tweaks are in place, ran out of time to finish it though.
2015-05-11 18:54:31 +01:00
b8734211d0
Fixes the pneumatic cannon recipe
2015-05-10 12:28:42 -04:00
332419ca31
adds target to do_after
2015-05-10 15:44:54 +10:00
502d21a4da
Merge branch 'master' of https://github.com/tgstation/-tg-station into redefiningwhatitmeanstobeadefine
...
Conflicts:
tgstation.dme
2015-05-10 14:48:35 +10:00
36be3b6983
Merge pull request #9110 from Xhuis/double_cannons
...
Adds the Pneumatic Cannon
2015-05-09 12:00:45 -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
7369992d3d
further reorganization, elimination of old defines folder
2015-05-09 23:16:57 +10: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
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
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
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
939ceae37d
Closes the <span> tag
2015-05-07 21:26:31 -04:00
41b1b7dee8
Adds a check to prevent a future ranged message + fixed the message
2015-05-07 23:55:26 +02:00
3e540dafdc
Adds D4 to the HARDFEET mix.
2015-05-07 18:43:50 +02:00
4892281057
Sanitized inputs, admin notices, and changelog
2015-05-07 08:46:38 -06:00
1fb8dcecd1
Prevents golems and skeletons from dropping due to shards and mousetraps
2015-05-07 15:44:17 +02:00
4595651740
You can attach a message to gang pings now
...
For the measly cost of 5 influence, bosses can send a discreet gang-wide message.
If this is non-freeze-friendly feel free to ignore this but it's a minor tweak that could help improve the fledgling game mode before people get sick of it.
2015-05-07 00:04:33 -06: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
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
cd92d28b0b
New welding tools sprites
2015-05-06 13:38:06 +02: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
e810855367
reorganizing stray objs in /defines
2015-05-05 21:18:21 +10: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
191e011c14
Merge pull request #9272 from phil235/BundleFix7
...
animal knockdown, nettle soup, defib, extinguisher fixes
2015-05-04 00:26:22 -05:00
78e25c3175
Merge pull request #9220 from RemieRichards/PlasmaaaaaaaMeeeeeeen
...
Ports VG's Plasmamen + Species breathing additions
2015-05-04 00:19:18 -05:00
8c1f6b1644
Mop span fix.
2015-05-04 05:57:31 +03:00
e4079cf923
Loyalty Implants and Gangsters
...
- Experiment: Loyalty implants will no longer survive deconverting a gangster. Security now needs to use two of them if they want the permanent effects: The first to deconvert them, and the second to make them loyal.
2015-05-03 19:36:13 -06:00
3b35e80e4d
Merge remote-tracking branch 'remotes/upstream/master' into Botcall_V2
...
Conflicts:
code/game/machinery/bots/bots.dm
2015-05-03 17:59:46 -05:00
df902d50fc
Bots Revamp
...
- Viciously rips radio code from bots, replacing it with something
better and faster!
- Bot patrol logic redesigned, much faster.
- Gives all bots Robotics access for easy patrol activation.
- Bot navigation beacons are no longer radios. Instead, they are
maintained in a global list.
- Navbeacons can now be accessed by Roboticists, and they use a better
UI.
- PDA bot code rewritten. They no longer use radio objects at all!
- Captain now has all-access! His cartridge now has everything except
Mime and Clown functions.
- There is now one button across all PDAs for accessing bots. Only bots
you have access to control will show on the list.
- Buffed the signaler cartridge! It may now be used to signal on all
valid frequencies.
- The AI's botcall interface now includes the bot's model, so it can
always identify the type of bot it is controlling. PDAs have this as
well.
- Spilled my blood to begin Jordie's dark ritual.
2015-05-03 17:31:10 -05:00
Xhuis
Cheridan
Firecage
Jordie0608
xxalpha
Fayrik
phil235
Remie Richards
francinum
Ikarrus
oranges
GunHog
kingofkosmos