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
4d3e341f7f
Merge pull request #5138 from paprka/HOTFIXMINING
...
Hotfix for mining scanner oldcode
2014-10-09 19:33:59 -07: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
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
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
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
f92e08d6a8
revert borg nerf
2014-10-07 20:34:28 -07:00
hornygranny
bb3fe4ed52
Merge pull request #5077 from Steelpoint/DeathSquad
...
Deathsquad Armour Buff
2014-10-07 20:00:57 -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
Jordie0608
5e5857e1fd
Removes telesci comp's update_icon override
2014-10-07 23:16:52 +11: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
0e1083fc39
adds zipcuffs
2014-10-06 20:35:10 -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
Remie Richards
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
Lo6a4evskiy
5fb3f9ac9c
Edited comment and added delay to roman armor
2014-10-06 22:07:11 +04:00
Hornygranny
265069f2a7
did it properly
2014-10-06 11:07:07 -07:00
Hornygranny
185048bfd5
can no longer stack resin structures
2014-10-06 10:55:20 -07:00
Lo6a4evskiy
61937c8dae
Changed strip delays for most clothes
2014-10-06 19:42:12 +04:00
Remie Richards
5b8b883cf0
Merge pull request #5050 from Incoming5643/spiders,man
...
Updates spiders to have full player functionality
2014-10-06 14:24:39 +01:00
Remie Richards
b463c5a51f
Merge pull request #5056 from Incoming5643/banthatshit
...
Adds step_x and step_y to the locked var list
2014-10-06 14:23:04 +01:00
Remie Richards
acf5bee200
Merge pull request #5092 from Cheridan/flashing
...
Flash Changes
2014-10-06 14:10:31 +01:00
paprka
ed3385dbf3
pro-LGBT grammar
2014-10-06 02:54:12 -07:00
Steelpoint
37ba4cc912
BuffExplsoive&Bio
2014-10-06 15:17:08 +08:00
paprka
89795c95bf
telebaton storage
2014-10-05 23:10:55 -07:00
paprka
2f960c8d89
lol
2014-10-05 22:25:53 -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
paprka
b9a10b5a82
removes qdel on death
2014-10-05 17:49:15 -07:00
Cheridan
df8dc6d119
Merge branch 'master' of https://github.com/tgstation/-tg-station into flashing
2014-10-05 19:24:49 -05:00
