8986181e44
fixes ziptie bug
2014-10-12 13:39:55 -07:00
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
562776e2fb
- Properly garbage collect dna injectors. Before you could pick them up if you were fast enough.
2014-10-12 20:50:23 +03:00
c83e0d65a0
used zipcuffs name change
2014-10-11 18:08:52 -07:00
5eb6a82970
Merge branch 'master' of https://github.com/tgstation/-tg-station into permits
...
Conflicts:
icons/obj/items.dmi
2014-10-11 17:48:46 -05:00
84e7121903
Adds construction permits
2014-10-11 17:39:27 -05:00
6235cb3401
stun logging for telebaton
2014-10-11 09:29:44 -07:00
cd60db5e18
Merge pull request #5124 from MrPerson/implant_action_button
...
Give implants an action button
2014-10-11 18:15:44 +02:00
db23e13575
Merge pull request #5098 from tkdrg/loadingloading
...
Wiki books now have a loading screen
2014-10-11 14:29:46 +02:00
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
b54ed5b4e5
Merge pull request #5137 from paprka/holosignoff
...
Adds holographic janitor signs
2014-10-10 17:41:41 +01:00
b9f4a54c56
Merge pull request #5132 from paprka/tacticool
...
Changes HUD in syndicate medkit to NV HUD
2014-10-10 17:29:18 +01:00
b2ca9776fd
expands medipens
2014-10-09 18:01:35 -07:00
fa55262f83
hyposprays fit in medibelts now
2014-10-09 14:40:14 -07:00
30b3294adc
Merge pull request #5123 from paprka/zippycuffs
...
Adds zipties
2014-10-08 21:12:05 -07:00
149c9a3a76
big update
2014-10-08 20:58:43 -07:00
23651b54f0
Merge pull request #5093 from paprka/medipens
...
Replaces a lot of inaprovaline syringes with medipens
2014-10-08 22:15:52 +01:00
b638daa384
oops
2014-10-08 13:52:21 -07:00
5457503c67
adds holographic janitor signs
2014-10-08 13:48:44 -07:00
16a0f12ffe
fixes name stuff
2014-10-08 13:33:17 -07:00
d61e4ac943
big commit, handcuff overhaul
2014-10-08 13:19:54 -07:00
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
8f9dfe0c5b
code optimizations (thanks remie)
2014-10-08 07:12:00 -07:00
c28dd40190
Merge pull request #5085 from paprka/WYATTSHIELDS
...
Adds telescopic riot shields
2014-10-07 21:13:03 -07:00
703c73247e
changes HUD to NV HUD
2014-10-07 20:37:11 -07:00
b124e4ac41
Merge pull request #5119 from paprka/arcwelder
...
Welding tool sprite updates
2014-10-07 20:12:30 -07:00
060c64b854
breakouttime increased to 45 sec
2014-10-07 19:30:02 -07:00
9797435df7
Merge pull request #5109 from paprka/telebatonstorage
...
Telebaton storage tweak
2014-10-07 14:25:56 -07:00
f96b017149
Merge pull request #5097 from phil235/Msg1Fix
...
Fixing a lot of messages
2014-10-07 12:09:01 -05:00
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
01d69299eb
changelog and consistency name fix
2014-10-06 21:21:03 -07:00
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
969e7f895b
cutt off
2014-10-06 20:51:51 -07:00
0e1083fc39
adds zipcuffs
2014-10-06 20:35:10 -07:00
1aff1d6c20
welding tool updates
2014-10-06 18:04:47 -07:00
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
d6a8e0de09
code nitpicking (thanks remie)
2014-10-06 12:39:15 -07:00
7c95d3b79b
stupid compile errors
2014-10-06 00:45:22 -07:00
89795c95bf
telebaton storage
2014-10-05 23:10:55 -07:00
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
19229f98e8
Spacemen can now skim.
2014-10-05 09:51:08 -03:00
dd7a3b7fbc
Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix
...
Conflicts:
code/modules/admin/admin_verbs.dm
2014-10-05 13:48:11 +02:00
eb2e5c4f31
medipens to default boxes
2014-10-05 03:10:17 -07:00
1bb6603ff4
replaces a lot of inaprov syringes with medipens
2014-10-04 22:03:09 -07:00
08be1b34eb
Revert "Changes a few green crosses to blue on sprites that I missed last time"
2014-10-04 19:22:10 -05:00
537280b4b9
Removing many instances of the no longer used second argument of message_admins() proc.
...
Replacing "for(var/mob/M in viewers()) M.show_message()" by "visible_message()" or audible_message()" in many places.
Changing a few span classes.
2014-10-05 01:29:30 +02:00
6d4fb1483a
adds telescopic riot shields
2014-10-04 15:58:27 -07:00
651c3e6db5
Merge to master - sole conflicting file was ninja.dm FUCK NINJAS
2014-10-04 01:45:39 -07:00
00f0ef8c9d
Merge branch 'master' of https://github.com/tgstation/-tg-station into telemelee
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-10-01 21:06:23 -07:00
255254cb69
Merge pull request #5038 from paprka/atmosbelt
...
Utility/medical belts can now hold pocket extinguishers
2014-10-01 21:24:58 -05:00
paprka
phil235
Perakp
Cheridan
Swag McYolosteinen
MrPerson
Remie Richards
hornygranny
tkdrg
paprka