23651b54f0
Merge pull request #5093 from paprka/medipens
...
Replaces a lot of inaprovaline syringes with medipens
2014-10-08 22:15:52 +01:00
f5e54f1fa8
Merge pull request #5069 from phil235/WindoorDeconstruction
...
Adds windoor deconstruction & bug fixes
2014-10-08 10:27:45 +01:00
c28dd40190
Merge pull request #5085 from paprka/WYATTSHIELDS
...
Adds telescopic riot shields
2014-10-07 21:13:03 -07:00
b124e4ac41
Merge pull request #5119 from paprka/arcwelder
...
Welding tool sprite updates
2014-10-07 20:12:30 -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
598ef16d29
Merge pull request #5107 from tkdrg/borg_cult
...
Fixes restarted borgs hearing cult chat
2014-10-07 08:06:47 -05: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
acf5bee200
Merge pull request #5092 from Cheridan/flashing
...
Flash Changes
2014-10-06 14:10:31 +01: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
a7f62f6d7c
Fixes restarted borgs hearing cult chat
2014-10-05 20:21:21 -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
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
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
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
041adce025
Merge pull request #5036 from paprka/telemelee
...
Telebatons for heads of staff
2014-10-04 17:09:20 -05:00
7a2d6be197
Merge pull request #5049 from nivomi/master
...
Added examine descriptions to various objects
2014-10-04 14:37:53 -05: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
a8056c6ba7
Merge pull request #4995 from Cheridan/hidey
...
Smuggler Satchels
2014-10-01 22:49:41 -03:00
eae5d0b7af
Smuggler pack can now fit in backpacks itself
...
Fixes some sprite issues
2014-10-01 17:33:08 -05:00
a760abf7bd
Merge remote-tracking branch 'upstream/master'
2014-10-01 14:29:49 -04:00
6e44354f9d
Merge pull request #4914 from RemieRichards/DroneImprove
...
Drone Improvements - Take 2 PR Boogaloo
2014-10-01 10:16:06 -05:00
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
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
93d160ed68
compile fix
2014-09-30 13:14:44 -07:00
d7a6ea4528
compile error fix
2014-09-30 12:42:04 -07:00
b775da4e60
extinguish fires
2014-09-30 12:38:59 -07:00
6303563bb8
adds telebatons for heads of staff
2014-09-30 12:29:25 -07:00
fa751f2f72
Merge pull request #4975 from phil235/CloneMessages
...
Replacing clone damage descriptions with "cellular damage".
2014-09-30 12:21:42 -05:00
219864312a
Merge pull request #4988 from Miauw62/420
...
Fixes a bunch of saycode things.
2014-09-30 10:23:23 +01:00
7e8e728d85
Merge pull request #4986 from Ikarrus/gangfixes
...
Gang Mode fixes and improvements
2014-09-29 10:33:17 -05:00
d98cf02a3f
Adds smugger packs to mining room, replaces booby-prize beer keg.
...
Adds to uplink_item.dm
Updated code, latest sprites.
2014-09-27 19:59:25 -05:00
ce3dca998b
Adds hidable backpack
2014-09-27 19:26:44 -05:00
0f5fd59c0c
Merge pull request #4919 from Miauw62/tatorbalance
...
Rebalances traitor items.
2014-09-27 17:13:50 -05:00
f0ddaf7d8e
Merge branch 'master' of https://github.com/tgstation/-tg-station into 420
...
Conflicts:
code/modules/admin/admin_verbs.dm
2014-09-27 16:09:31 +02:00
77584d4a7d
Fixes a bunch of saycode things. Objs can now hear radio talk.
...
Added a proper strip_html() function.
Fixed #4959
2014-09-27 16:06:06 +02:00
131b5ee0ec
- Removes the useless has_been_rev var
...
- Reworded intercept report to discourage security from inadvertently causing a gang to win.
- Recaller use is logged
- Made the text explaining membership visibility more visible
2014-09-26 21:37:07 -06:00
65e38bdfbc
Gang Mode fixes and improvements
...
The first of many. Most caused by horrible merge-related accidents.
- Gang converts are no longer revolutionaries
- Revolution controls show up in the TP again
- Gang added to game_options.txt defaulting to 0
- Clarified some help text strings
2014-09-26 19:27:13 -06:00
1d9834b159
Adding changelog and correcting a typo
2014-09-25 20:06:01 +02:00
b00b41bbf9
Replacing clone damage descriptions by "cellular damage".
2014-09-25 19:11:31 +02:00
Remie Richards
hornygranny
MrPerson
Cheridan
paprka
tkdrg
phil235
paprka
Aranclanos
nobalm
Miauw
ikarrus