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
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
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
paprka
01d69299eb
changelog and consistency name fix
2014-10-06 21:21:03 -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
phil235
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
paprka
eb2e5c4f31
medipens to default boxes
2014-10-05 03:10:17 -07:00
paprka
1bb6603ff4
replaces a lot of inaprov syringes with medipens
2014-10-04 22:03:09 -07:00
Cheridan
91cd4b2476
Final tweaks, map update. replaces cyborg's flash with their own subtype with the special effect.
2014-10-04 22:01:51 -05:00
Cheridan
cd1cefdd7b
Flash Update
...
MASSIVE CLEANUP of flash code.
Instead of Weaken(), flashes now add confusion, similar to being drunk.
Synth flashes removed.
2014-10-04 19:51:14 -05:00
Cheridan
08be1b34eb
Revert "Changes a few green crosses to blue on sprites that I missed last time"
2014-10-04 19:22:10 -05:00
phil235
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
paprka
6d4fb1483a
adds telescopic riot shields
2014-10-04 15:58:27 -07:00
Cheridan
041adce025
Merge pull request #5036 from paprka/telemelee
...
Telebatons for heads of staff
2014-10-04 17:09:20 -05:00
Cheridan
7a2d6be197
Merge pull request #5049 from nivomi/master
...
Added examine descriptions to various objects
2014-10-04 14:37:53 -05:00
MrPerson
651c3e6db5
Merge to master - sole conflicting file was ninja.dm FUCK NINJAS
2014-10-04 01:45:39 -07:00
paprka
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
Cheridan
255254cb69
Merge pull request #5038 from paprka/atmosbelt
...
Utility/medical belts can now hold pocket extinguishers
2014-10-01 21:24:58 -05:00
Aranclanos
a8056c6ba7
Merge pull request #4995 from Cheridan/hidey
...
Smuggler Satchels
2014-10-01 22:49:41 -03:00
Cheridan
eae5d0b7af
Smuggler pack can now fit in backpacks itself
...
Fixes some sprite issues
2014-10-01 17:33:08 -05:00
nobalm
a760abf7bd
Merge remote-tracking branch 'upstream/master'
2014-10-01 14:29:49 -04:00
Cheridan
6e44354f9d
Merge pull request #4914 from RemieRichards/DroneImprove
...
Drone Improvements - Take 2 PR Boogaloo
2014-10-01 10:16:06 -05:00
nobalm
6998162069
Added descriptions to objects
...
Descriptions were added to the following objects:
supply shuttle console, supply ordering console, air alarm, AI system
integrity restorer, cloning console, operating computer, prisoner
management console, AI display, exosuit control console, mech bay power
control console, inteliCard, labor shuttle console, mining shuttle
console, photocopier, PanD.E.M.I.C 2200, Circuit Imprinter, Destructive
Analyzer, Protolathe, Robotics R&D Console, R&D Server Controller
2014-09-30 23:43:07 -04:00
phil235
47521d5081
More windoor bug fixes. You can no longer build two windoors on top of each other. You can make a windoor_assembly w/ rglass on the same tile as another one as long as they have different directions.
2014-09-30 23:05:18 +02:00
paprka
93d160ed68
compile fix
2014-09-30 13:14:44 -07:00
paprka
d7a6ea4528
compile error fix
2014-09-30 12:42:04 -07:00
