Commit Graph

3061 Commits

Author SHA1 Message Date
Cheridan 36be3b6983 Merge pull request #9110 from Xhuis/double_cannons
Adds the Pneumatic Cannon
2015-05-09 12:00:45 -05:00
Cheridan 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
phil235 1875f3a9c2 Merge pull request #9377 from Jordie0608/thebackpackistherealmagicitemhere
Group of fixes
2015-05-09 16:23:46 +02:00
Jordie 9387af3587 Merge pull request #9403 from francinum/patch-1
Span Closure
2015-05-09 22:12:04 +10:00
Jordie 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
Jordie 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
Jordie 4e82cd9689 Merge pull request #9355 from Firecage/OverlaycleanBGone
Removes the ability to clean Overlays
2015-05-09 21:30:21 +10:00
Jordie 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
Remie Richards fdeb84021d Merge pull request #9320 from GunHog/Botcall_V2
Bot performance and PDA features update
2015-05-09 06:26:19 +01:00
Cheridan f0003cd7d4 Merge pull request #9385 from optimumtact/forkingfantastic
Fork eating no longer requires mouth zone sel
2015-05-08 15:51:43 -05:00
Jordie 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
francinum 939ceae37d Closes the <span> tag 2015-05-07 21:26:31 -04:00
Firecage 3e540dafdc Adds D4 to the HARDFEET mix. 2015-05-07 18:43:50 +02:00
Firecage 1fb8dcecd1 Prevents golems and skeletons from dropping due to shards and mousetraps 2015-05-07 15:44:17 +02:00
Cheridan d28cd28426 Merge pull request #9315 from kingofkosmos/attackmsgfix
Removes unnecessary attack-messages
2015-05-06 22:34:30 -05:00
oranges 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
GunHog 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
Cheridan 46b2fe33af Merge pull request #9291 from Ikarrus/gangmind
Gang Update
2015-05-06 10:04:26 -05:00
Jordie0608 f85b3735bd group of fixes 2015-05-07 00:40:26 +10:00
Firecage cd92d28b0b New welding tools sprites 2015-05-06 13:38:06 +02:00
Firecage 0ebbc811ac Fixes experimental welding tool 2015-05-05 23:44:46 +02:00
Firecage 8e79448c11 New sprites and name 2015-05-05 22:30:48 +02:00
Firecage c0c2c8b097 cleanable #define 2015-05-05 18:51:44 +02:00
Firecage 522e77752f Removes the ability to clean Overlays 2015-05-05 17:36:51 +02:00
xxalpha 96ab44536d Fixed smoking pipe messages. Fixed emptying empty pipes.
Improved check.
2015-05-04 22:34:08 +01:00
Cheridan dfaf90c79e Merge pull request #9264 from phil235/BundleFix6
a group of fixes.
2015-05-04 09:41:01 -05:00
Cheridan 191e011c14 Merge pull request #9272 from phil235/BundleFix7
animal knockdown, nettle soup, defib, extinguisher fixes
2015-05-04 00:26:22 -05:00
Cheridan 78e25c3175 Merge pull request #9220 from RemieRichards/PlasmaaaaaaaMeeeeeeen
Ports VG's Plasmamen + Species breathing additions
2015-05-04 00:19:18 -05:00
kingofkosmos 8c1f6b1644 Mop span fix. 2015-05-04 05:57:31 +03:00
Ikarrus 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
GunHog 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
GunHog 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
Remie Richards e5f034fc0d Merge pull request #9147 from GunHog/Rise_Of_The_RR_Androids
[Review Ready] Positronic Brains!
2015-05-03 06:34:02 +01:00
Xhuis ce49f52405 Lowers charge time 2015-05-02 21:27:54 -04:00
Xhuis 08053c0235 Makes the emagged defib more worthwhile 2015-05-02 14:17:05 -04:00
Jordie 3606662c88 Merge pull request #9106 from phil235/BundleFix5
Cyborgs, MMIs, and other fixes
2015-05-02 23:59:22 +10:00
Jordie d1f55ec69a Merge pull request #9203 from Boggart/RpdUiFix
Fixes being unable to switch back to the previous pipe type without switching off it and back after using the delete or paint modes.
2015-05-02 23:58:55 +10:00
MrStonedOne eb7d5fefa5 Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious
Conflicts:
	code/controllers/subsystem/ticker.dm
2015-05-02 03:03:29 -07:00
phil235 be1708483e - Fixed nettle soup recipe says abstract nettle.
- Fixes hostile animals weakening non carbons, and adjusted weakening values 1958.
- fixes being able to drop defib paddle by resting, fix a runtime linked to this.
- can no longer pick card from deck while resting, same for paper bin and bedsheet bin.
- examining extinguisher and atmos watertank nozzle gives you the amount of water remaining.
2015-05-02 01:34:38 +02:00
Cheridan 0d1cfba3b7 Merge pull request #9200 from Ikarrus/ERTcodes
[Z2 MAP] Centcom Response Team Variations
2015-05-01 14:31:22 -05:00
Cheridan 2d021ab175 Merge pull request #9226 from Ikarrus/gang5.2
Gang Update
2015-05-01 13:00:51 -05:00
phil235 4a8e168ff3 - admin revive clears addiction list. 8894
- buffed capsaicin/frost oil temperature effects as well as basilisk temperature effect (to counterbalance the recent change in natural bodytemp stabilization). And slight nerf to ghost chili temp boost when held in hand (for consistency). 8501
- fixes religion name choice window labeled as mime name
- fixes nearly invincible larva 9223
- your health/status now updates immediately after taking damage, we don't wait for the next life(). 7031
- Fixes alien nest overlay not updating when dead mob is gibbed by larva exit. 8523
- fixes flamethrower tablecrafting. 9261
2015-05-01 19:45:36 +02:00
Cheridan 9e6b93ae6c Merge pull request #9219 from xxalpha/winter_is_coming
Fixed unlimited uses crayons not being unlimited.
2015-05-01 12:01:11 -05:00
Xhuis bb54a75d58 Fixes overlays 2015-04-30 20:59:50 -04:00
Xhuis 37d631ca57 Fixes conflicts 2015-04-30 20:40:09 -04:00
Xhuis a8222d9c50 Merge remote-tracking branch 'remotes/upstream/master' into cannons 2015-04-30 18:52:27 -04:00
Xhuis 577c68208a Adds sprites and does some polishing 2015-04-30 18:51:03 -04:00
Ikarrus 0615b4e09a Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTcodes 2015-04-30 08:56:46 -06:00
Ikarrus 68d4ffaf3f uncommitted files (+5 squashed commit)
Squashed commit:

[971e023] Lets try loosening the restrictions on territory tagging

[c55a30d] Reduced pen cost to 40

[2b83dca] Formatting and changelog

[1fe81a8] Let's make the message slightly less gamey

[3067acc] Changeloggery
2015-04-29 20:28:28 -06:00
Ikarrus 2b83dca4c5 Formatting and changelog 2015-04-29 19:29:15 -06:00