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
Remie Richards
afb0808748
Merge pull request #5133 from paprka/glovestation
...
Changes robotics gloves to fingerless gloves
2014-10-10 17:26:40 +01:00
Remie Richards
d6498f2588
Merge pull request #5126 from Jordie0608/ex_act-or,exactor
...
Removes telesci comp's update_icon override
2014-10-10 15:05:44 +01:00
hornygranny
aaa1914e9a
Merge pull request #5154 from RemieRichards/Reverting-AntagBeforeJobs
...
Reverts Antag selection happening before job selection
2014-10-10 00:21:49 -07:00
hornygranny
4d3e341f7f
Merge pull request #5138 from paprka/HOTFIXMINING
...
Hotfix for mining scanner oldcode
2014-10-09 19:33:59 -07:00
Remie Richards
be6c8c54d1
Reverts Antag selection happening before job selection
2014-10-09 22:57:19 +01:00
hornygranny
c55480af16
Merge pull request #5100 from Lo6a4evskiy/Armor_stripping_delay
...
Stripping delay adjustments
2014-10-09 13:46:59 -07:00
Cheridan
c9ef6e4308
Merge pull request #5128 from MrStonedOne/whyisaywhyisaythisisagoodpr
...
fixes issue preventing admins from using hotkey mode
2014-10-09 12:25:40 -05: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
hornygranny
981df33b57
Merge pull request #5129 from paprka/hospatch
...
Eyepatch HUD for HoS
2014-10-08 19:50:53 -07:00
paprka
c52916ad01
M'LADY
2014-10-08 14:48:17 -07:00
hornygranny
02d8cf4115
Merge pull request #4994 from paprka/miningainteasy
...
Mining rebalancing
2014-10-08 14:44:35 -07:00
Remie Richards
e60dda5f0e
Merge pull request #5106 from paprka/megacarps
...
Ports megacarps!!!
2014-10-08 22:16:22 +01: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
Swag McYolosteinen
8589c8c874
Merge pull request #5120 from nivomi/turretsounds
...
Make spawned turrets use projectile-appropriate SFX
2014-10-08 20:57:21 +02:00
paprka
4c78323aa0
conflict resolution
2014-10-08 11:38:03 -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
Lo6a4evskiy
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
paprka
d80be7f689
changes robotics gloves to fingerless gloves
2014-10-08 05:11:30 -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
Remie Richards
7892359207
Merge pull request #5114 from hornygranny/fatstacks
...
can no longer stack resin structures
2014-10-08 10:21:49 +01:00
Remie Richards
8503bd632b
Merge pull request #5103 from paprka/largebow
...
Readds large crossbow to protolathe
2014-10-08 10:18:51 +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
paprka
f92e08d6a8
revert borg nerf
2014-10-07 20:34:28 -07:00
hornygranny
b124e4ac41
Merge pull request #5119 from paprka/arcwelder
...
Welding tool sprite updates
2014-10-07 20:12:30 -07:00
hornygranny
e223e4be1d
Merge pull request #5112 from paprka/linghivemindshitomg
...
Lingspeak by default: easy edition
2014-10-07 20:06:33 -07:00
hornygranny
bb3fe4ed52
Merge pull request #5077 from Steelpoint/DeathSquad
...
Deathsquad Armour Buff
2014-10-07 20:00:57 -07:00
hornygranny
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
paprka
060c64b854
breakouttime increased to 45 sec
2014-10-07 19:30:02 -07:00
paprka
216682bccf
eyepatch HUD
2014-10-07 19:18:18 -07:00
MrStonedOne
a11eacc8b8
fixes issue preventing admins from using hotkey mode
2014-10-07 15:30:42 -07:00
MrPerson
3eccc3a709
Merge pull request #5091 from hornygranny/patch-1
...
bookcases no longer opaque
2014-10-07 14:31:01 -07:00
MrPerson
9797435df7
Merge pull request #5109 from paprka/telebatonstorage
...
Telebaton storage tweak
2014-10-07 14:25:56 -07:00
nobalm
0a1df18f25
Turret SFX and spawning changes
...
* Turrets now use the SFX associated with the weapon installed in them
* Turrets now have a default installed gun for when they are spawned
* fire_sound is now a property of all ammunition, not just energy ammo,
which should make future additions a lot simpler.
* Added some energy gun SFX handling to the giant switch statement at
the top of portable_turret.dm, because 'emagged' and 'lethal' are the
same thing and have to be handled weirdly.
* The upshot of all these changes is that every turret, constructed or
default, should make exactly the right noise, even if guns are added in
the future!
2014-10-07 16:44:51 -04:00
Cheridan
f96b017149
Merge pull request #5097 from phil235/Msg1Fix
...
Fixing a lot of messages
2014-10-07 12:09:01 -05:00
Cheridan
0d0ae75102
Merge pull request #5108 from paprka/fixrobogrammar
...
Fixes grammar in robot.dm
2014-10-07 09:14:41 -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
Jordie0608
5e5857e1fd
Removes telesci comp's update_icon override
2014-10-07 23:16:52 +11:00
Jordie0608
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
Lo6a4evskiy
18ad0292c3
fixed compilation errors
2014-10-07 12:47:53 +04: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
Lo6a4evskiy
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
paprka
01d69299eb
changelog and consistency name fix
2014-10-06 21:21:03 -07:00
nobalm
6b556f5bed
Fixed comment to reflect reality
...
Spent 2 hours working out how turrets create sounds before figuring out
that I'm an idiot.
2014-10-07 00:20:40 -04:00
