Commit Graph

1965 Commits

Author SHA1 Message Date
Aranclanos bd2f0692d3 Merge pull request #5222 from phil235/c4GibFix
You can no longer gib mob with c4+signaler
2014-10-15 10:43:20 -03:00
Aranclanos a31b372ea7 Merge pull request #5171 from phil235/ed209fix
A lot of secbot/ed-209 fixes.
2014-10-15 10:42:30 -03:00
Remie Richards 7bb012127c Merge pull request #5235 from phil235/CollapsibleRollerBed
Collapsible Rollerbed
2014-10-15 11:54:48 +01:00
phil235 619a38ad89 Adds the ability to collapse rollerbed (from baystation). Fixes being able to pick up pill bottles and fold bodybags through windows via click drag. 2014-10-13 17:17:53 +02:00
Remie Richards 4640999701 Merge pull request #5199 from paprka/telebatonlog
stun logging for telebaton
2014-10-13 11:48:17 +01:00
Remie Richards 399977d882 Merge pull request #5095 from MrPerson/table_module
Move table crafting into the modules folder plus improvements
2014-10-13 10:42:16 +01:00
paprka 739cc29dbd removes typecasting from zipcuffs cutting 2014-10-12 14:02:04 -07:00
paprka 8986181e44 fixes ziptie bug 2014-10-12 13:39:55 -07:00
phil235 f5eb963720 You can no longer gib mobs by placing a c4 with a signaler on its wire in the hands/pocket/backpack of the mob and sending the signal. 2014-10-12 22:17:37 +02:00
paprka 6235cb3401 stun logging for telebaton 2014-10-11 09:29:44 -07:00
Swag McYolosteinen cd60db5e18 Merge pull request #5124 from MrPerson/implant_action_button
Give implants an action button
2014-10-11 18:15:44 +02:00
Swag McYolosteinen db23e13575 Merge pull request #5098 from tkdrg/loadingloading
Wiki books now have a loading screen
2014-10-11 14:29:46 +02:00
MrPerson 863f28f295 On second thought, leave the result as just a path
Fix up IED's so they work correctly when tablecrafted. Also remove their manual crafting.

Merge branch 'master' of https://github.com/tgstation/-tg-station into table_module

Conflicts:
	code/game/objects/structures/tables_racks.dm
2014-10-10 14:30:41 -07:00
Remie Richards b54ed5b4e5 Merge pull request #5137 from paprka/holosignoff
Adds holographic janitor signs
2014-10-10 17:41:41 +01:00
Remie Richards b9f4a54c56 Merge pull request #5132 from paprka/tacticool
Changes HUD in syndicate medkit to NV HUD
2014-10-10 17:29:18 +01:00
phil235 5fadf38aa6 Merge branch 'master' of https://github.com/tgstation/-tg-station into ed209fix
Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/secbot.dm
2014-10-10 17:12:05 +02:00
phil235 f40edc5ce6 *FIX: the taser that ed209 drops on death looks full but is empty(need an update icon shit)
*FIX: issue4487 (lasersound)

*Fix: repairing bot with weldingtool off. Gives warning msg.

*FIX: medbot fleeing one step when using weldtool/holosword.

*Fix: attacking silicon w/ holosword no longer gives spark.

*FIX: attacking bot w/ holosword is an assault.

*FIX: bots produce spark when damaged via attakby, similar to borgs.

*FIX: attacking ED209 with weldingtool on harm now triggers the bot response to the assault.

*FIX: bots can produce sparks when hit by projectile w/ damage>0. (to have some feedback b/c there's no msg otherwise)

*FIX: ED209 doesn't try to tase monkey despite wanting to arrest.

*FIX: LaserTAG ED209 points at monkey despite not shooting/hunting them.

*FIX: we don't check projectiletype and sound each time we fire. (Now only when using New() or emagging/hacking/emp'ing) (also

simplifying code)

*FIX: cannot access behavior mode to toggle patrol on lasertag ED209 (despite the fact that it should be able to patrol.

*FIX: ED209 tases cuffed target that are standing.

*FIX: ED209 can stun through a closet! And, it can cuff through windows and closet.

*FIX: the handcuffing problem. (issue2025)

*FIX: no message when trying to screwdriver panel of bots open but it's locked.

*FIX: added one audible message instead of for+show

*FIX: make 'detain' mean stun repeatedly. (issuenumber???)

*FIX: After finishing summon order, bot goes patrolling even if no auto_patrol.

*FIX: ED209 cannot be summoned or appear on the PDA securitron interlink cartridge.

FIX: autocustom names for lasertag ed209s doesn't work (if you don't give them a custom name, it gives them a custom one from a

list)

Removing maxstuns var in process() proc of both ED and beepsky. It doesn't do shit.
Lasertag ED no longer calls look_for_perp(), the loss in reaction speed is minimal. And it no longer calls for infraction
Adding myself as game master admin list.
2014-10-10 16:34:26 +02:00
Swag McYolosteinen 7d11253f39 Merge pull request #4861 from Lo6a4evskiy/Custom_graffiti
Choosing graffiti instead of drawing random one
2014-10-09 16:31:13 +02:00
hornygranny 30b3294adc Merge pull request #5123 from paprka/zippycuffs
Adds zipties
2014-10-08 21:12:05 -07:00
paprka 149c9a3a76 big update 2014-10-08 20:58:43 -07:00
Remie Richards 23651b54f0 Merge pull request #5093 from paprka/medipens
Replaces a lot of inaprovaline syringes with medipens
2014-10-08 22:15:52 +01:00
paprka b638daa384 oops 2014-10-08 13:52:21 -07:00
paprka 5457503c67 adds holographic janitor signs 2014-10-08 13:48:44 -07:00
paprka 16a0f12ffe fixes name stuff 2014-10-08 13:33:17 -07:00
paprka d61e4ac943 big commit, handcuff overhaul 2014-10-08 13:19:54 -07:00
paprka 668bb52a1e Merge branch 'master' of https://github.com/tgstation/-tg-station into zippycuffs
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
2014-10-08 07:17:42 -07:00
paprka 8f9dfe0c5b code optimizations (thanks remie) 2014-10-08 07:12:00 -07:00
Remie Richards f5e54f1fa8 Merge pull request #5069 from phil235/WindoorDeconstruction
Adds windoor deconstruction & bug fixes
2014-10-08 10:27:45 +01:00
hornygranny c28dd40190 Merge pull request #5085 from paprka/WYATTSHIELDS
Adds telescopic riot shields
2014-10-07 21:13:03 -07:00
paprka 703c73247e changes HUD to NV HUD 2014-10-07 20:37:11 -07:00
hornygranny b124e4ac41 Merge pull request #5119 from paprka/arcwelder
Welding tool sprite updates
2014-10-07 20:12:30 -07:00
paprka 060c64b854 breakouttime increased to 45 sec 2014-10-07 19:30:02 -07:00
MrPerson 9797435df7 Merge pull request #5109 from paprka/telebatonstorage
Telebaton storage tweak
2014-10-07 14:25:56 -07:00
Cheridan f96b017149 Merge pull request #5097 from phil235/Msg1Fix
Fixing a lot of messages
2014-10-07 12:09:01 -05:00
Cheridan 598ef16d29 Merge pull request #5107 from tkdrg/borg_cult
Fixes restarted borgs hearing cult chat
2014-10-07 08:06:47 -05:00
Lo6a4evskiy 41eb04356f Merge remote-tracking branch 'upstream/master' into Custom_graffiti
Conflicts:
	code/game/objects/effects/decals/crayon.dm
2014-10-07 12:43:59 +04:00
MrPerson 1995ac638b Allow activating implants even when stunned and such
Make ninja implants show up right
Add a changelog for the action_button stuff
2014-10-07 01:04:10 -07:00
paprka 01d69299eb changelog and consistency name fix 2014-10-06 21:21:03 -07:00
MrPerson dea5cc4bcb Give implants an action button
Because spells for this is dumb

Featuring activation buttons that totally are 100% coderart.
2014-10-06 21:05:09 -07:00
paprka 969e7f895b cutt off 2014-10-06 20:51:51 -07:00
paprka 0e1083fc39 adds zipcuffs 2014-10-06 20:35:10 -07:00
paprka 1aff1d6c20 welding tool updates 2014-10-06 18:04:47 -07:00
Cheridan 66304667cf Merge branch 'dualswordstake3' of https://github.com/Aranclanos/-tg-station into Aranclanos-dualswordstake3
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/datums/uplink_item.dm
2014-10-06 19:27:14 -05:00
paprka d6a8e0de09 code nitpicking (thanks remie) 2014-10-06 12:39:15 -07:00
Remie Richards acf5bee200 Merge pull request #5092 from Cheridan/flashing
Flash Changes
2014-10-06 14:10:31 +01:00
paprka 7c95d3b79b stupid compile errors 2014-10-06 00:45:22 -07:00
paprka 89795c95bf telebaton storage 2014-10-05 23:10:55 -07:00
Cheridan f5b5ead3ef Merge pull request #4516 from MrPerson/examinate_the_doctor
Change examine() from an atom verb to a mob verb
2014-10-05 23:37:34 -05:00
tkdrg a7f62f6d7c Fixes restarted borgs hearing cult chat 2014-10-05 20:21:21 -03:00
tkdrg 19229f98e8 Spacemen can now skim. 2014-10-05 09:51:08 -03:00