8f9dfe0c5b
code optimizations (thanks remie)
2014-10-08 07:12:00 -07:00
98e04ca52e
Merge remote-tracking branch 'upstream/master' into Armor_stripping_delay
...
Conflicts:
code/modules/clothing/spacesuits/miscellaneous.dm
2014-10-08 16:45:22 +04:00
d80be7f689
changes robotics gloves to fingerless gloves
2014-10-08 05:11:30 -07: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
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
e611301f0f
Merge pull request #5044 from Jordie0608/mapmergersoannoying
...
Fixes #4788 Resin walls on the abandoned mining station
2014-10-07 19:39:12 -07:00
060c64b854
breakouttime increased to 45 sec
2014-10-07 19:30:02 -07:00
216682bccf
eyepatch HUD
2014-10-07 19:18:18 -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
208b136996
Merge branch 'master' of https://github.com/tgstation/-tg-station into mapmergersoannoying
...
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-10-07 21:56:06 +11:00
18ad0292c3
fixed compilation errors
2014-10-07 12:47:53 +04:00
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
01ae516481
Merge remote-tracking branch 'upstream/master' into Armor_stripping_delay
...
Conflicts:
code/modules/clothing/under/miscellaneous.dm
2014-10-07 12:38:47 +04: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
ea4e6f823c
Merge pull request #5051 from paprka/rollingjsuit
...
Ports and improves jumpsuit rolling (casual adjusting) and noir detective set
2014-10-06 20:45:28 +01:00
175d42061c
Merge pull request #5088 from paprka/syndiesheet
...
Syndicate mother base/ship changes
2014-10-06 20:44:02 +01:00
d6a8e0de09
code nitpicking (thanks remie)
2014-10-06 12:39:15 -07:00
61937c8dae
Changed strip delays for most clothes
2014-10-06 19:42:12 +04:00
5b8b883cf0
Merge pull request #5050 from Incoming5643/spiders,man
...
Updates spiders to have full player functionality
2014-10-06 14:24:39 +01:00
304a865ff7
Merge pull request #5089 from tkdrg/tubesarecool
...
Constructable transit tubes!
2014-10-06 14:22:22 +01:00
acf5bee200
Merge pull request #5092 from Cheridan/flashing
...
Flash Changes
2014-10-06 14:10:31 +01:00
694f9fda91
Tablecrafting improvements:
...
Allow more than one result. All components will be placed inside the first result in the list.
Completion of crafting will now reset the interface, if possible.
Opening the interface now causes you to face the table.
2014-10-06 01:24:26 -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
df8dc6d119
Merge branch 'master' of https://github.com/tgstation/-tg-station into flashing
2014-10-05 19:24:49 -05:00
a7f62f6d7c
Fixes restarted borgs hearing cult chat
2014-10-05 20:21:21 -03:00
4ef2e494a1
Changes flip/rotation, better diagonal handling
2014-10-05 14:09:10 -03: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
0c9c9c8b0a
Reduces decon time to 35 and adds a missed init_dirs
2014-10-05 08:46:34 -03:00
e1c0351e16
Merge branch 'master' of https://github.com/tgstation/-tg-station into plasmadoorfix
...
Conflicts:
code/game/machinery/doors/airlock.dm
2014-10-05 13:24:14 +02:00
eb2e5c4f31
medipens to default boxes
2014-10-05 03:10:17 -07:00
b04f547cd1
Move table crafting into the modules folder
2014-10-04 23:43:03 -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
fb7aff426d
Merge pull request #5039 from paprka/hatstation13
...
Some job-specific hat rebalancing
2014-10-04 20:51:08 -05:00
d7937fcd1a
This comment was supposed to be deleted
2014-10-04 21:58:12 -03: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
2257c8f985
new syndicate map changes
2014-10-04 17:40:28 -07:00
paprka
Lo6a4evskiy
Remie Richards
hornygranny
MrPerson
Cheridan
Jordie0608
tkdrg
phil235