Jordie
94de5c997e
Merge pull request #8439 from GunHog/SteelpointsSecCamsAndLights
...
Attachable Seclite & Camera to Helmet
2015-03-22 16:56:11 +11:00
GunHog
31c5e648f4
Secbots now require Sec helmets
...
Only Sec helmets with a camera and no flashlight can be used to create a
securitron assembly.
2015-03-21 17:10:55 -05:00
Razharas
2271499db7
Merge pull request #8058 from Iamgoofball/explosive
...
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
2015-03-21 09:54:11 +03:00
Jordie
5d1155e09e
Merge pull request #8435 from Zelacks/ChemImplantGuiFix
...
Chemical implant action button fix
2015-03-21 17:25:08 +11:00
Jordie
13fdc0e0cb
Merge pull request #8299 from tgstation/RemieRichards-poolingUpdate
...
Makes PlaceInPool() call Destroy() on the atom
2015-03-21 17:24:17 +11:00
Jordie
d496fe241f
Merge pull request #8228 from Xhuis/orion_trail_emag
...
Adds an emag mode to the Orion Trail game
2015-03-21 17:23:44 +11:00
Jordie
d361649df5
Merge pull request #8369 from pudl/retardfix
...
normal sec headset
2015-03-21 17:23:18 +11:00
Remie Richards
819422bc3e
Merge pull request #8410 from Miauw62/yesgunhogimrewritinggoofsay
...
MIAUW VON SAYCODE 3: RISE OF THE SPANS
2015-03-21 05:05:37 +00:00
xxalpha
c25576ad6a
Merge remote-tracking branch 'upstream/master' into catwalkmachines
...
Conflicts:
code/game/objects/structures/lattice.dm
2015-03-20 17:02:00 +00:00
Swag McYolosteinen
9e25fe4019
Merge pull request #8431 from AnturK/lawsupdated
...
Adds total law changes counter
2015-03-20 17:46:44 +01:00
Swag McYolosteinen
57aadcc7fb
Merge pull request #8424 from phil235/SiliconWeldProtFix
...
Fixes silicons being flashed when welding.
2015-03-20 17:46:16 +01:00
Swag McYolosteinen
7d17c54555
Merge pull request #8411 from xxalpha/cablefix
...
Fixes cables being destroyed when creating plating out of catwalk space.
2015-03-20 17:45:36 +01:00
Swag McYolosteinen
28a9ff21d7
Merge pull request #8396 from Incoming5643/Zob_blombies
...
Blob zombie runtime fix + a tweak
2015-03-20 17:43:46 +01:00
Swag McYolosteinen
d95209a5df
Merge pull request #8391 from Incoming5643/Statue_of_limitations
...
Fixes invincible unstoppable death statues
2015-03-20 17:43:22 +01:00
GunHog
46ca095f2b
Tweaks and fixes
...
- You can now make Securitrons with Sec helmets.
- Helmet cameras now function as borg cameras do. They will update the
chunk on the next game tick, if the camera is moved.
- Helmet cameras are now vulnerable to EMP (camera alarm is not
triggered)
- Removed the extra canAttachCam lines.
- Paid my tithe to Lord of Changelogs.
2015-03-20 09:39:50 -05:00
Xhuis
03fcb9e139
Makes the machine less deadly to non-users
2015-03-20 07:23:59 -04:00
GunHog
e1668e985f
Attachable Seclite & Camera to Helmet
...
Steals #8109
2015-03-19 23:40:37 -05:00
Zelacks
8e2850f832
The action button should be correctly handled in chem implants by injecting all the reagents if the action buttion is the cause
2015-03-20 03:58:58 +08:00
Miauw
c4892765db
Makes the sayspan rewrite not runtime everything to fuck.
...
Also fixes #8168
2015-03-19 20:42:33 +01:00
Miauw
16258d3096
Standardizes a tiny thing.
2015-03-19 18:21:57 +01:00
Miauw
7e5a150e6f
Optimizes HTML. Thanks Gia.
2015-03-19 18:14:32 +01:00
AnturK
7cccf20fc0
Adds total law changes counter
2015-03-19 14:57:12 +01:00
Jordie
0cdd34ee05
Merge pull request #8354 from MMMiracles/hardsuit_upgrade
...
Revamps ERT suits to use helmet toggle
2015-03-19 16:45:05 +11:00
Jordie
6b946c1158
Merge pull request #8399 from Menshin/mech_guns_tidying
...
Unified mechs energy and ballistics guns firing proc
2015-03-19 16:44:54 +11:00
Jordie
9551919970
Merge pull request #8395 from xxalpha/jetpacktrail
...
Fixes the jetpack trail animation.
2015-03-19 16:44:37 +11:00
Jordie
b2953d71c7
Merge pull request #8263 from dannno/glasses
...
cosmetic glasses n shit
2015-03-19 16:44:20 +11:00
Jordie
e5fdddc7d8
Merge pull request #8289 from Xhuis/alt_clicking
...
Allows alt-clicking for some stuff
2015-03-19 16:43:53 +11:00
Iamgoofball
b7adce753a
Fixes unreported bug with clf3, changes the brainloss in heart attack to do 1 brute instead of 10 brain, makes health scanners show heart attacks.
2015-03-18 20:33:03 -07:00
phil235
c9312a6ab7
Fixes silicons being flashed when welding. Silicons and repair drones now have eye protection like aliens. This means flashers and flashbangs no longer flash them, but flashbang still weaken them, and lasers and handheld flashes still work on them.
2015-03-19 04:04:44 +01:00
Miauw
1b753dd1c5
Adds the comic sans span to the new system.
2015-03-18 21:09:36 +01:00
xxalpha
790bdd90b0
Fixes cables being destroyed when creating plating out of catwalk space.
2015-03-18 19:17:04 +00:00
Miauw
1873143e63
Initial say cleanup commit.
2015-03-18 19:23:31 +01:00
Menshin
ca9f31a0e3
* Unified the firing proc for energy and ballistics mech guns
...
* Fixes incendiaries bullets runtiming on qdel
2015-03-17 23:58:03 +01:00
xxalpha
50e4b1a024
Fixes jetpack trail animation.
...
Fixes jetpack trail animation 2.
2015-03-17 21:22:47 +00:00
Incoming
872697e3db
Fixes a runtime when blobs unaffiliated with a overmind zombified someone
...
Zombified corpses will now use the zombie body instead of the husked body. This doesn't mean that people cloned post zombification will be zombies though.
2015-03-17 16:50:53 -04:00
Incoming
612ededfd0
Removes factions from sentient mobs, as they both don't need them being player contr and it leads to some really exotic bugs.
...
Fixes an unreported bug where statues could bleed out
2015-03-17 14:26:05 -04:00
Jordie
5b0731390f
Merge pull request #8366 from phil235/VendingMachineSpawnFix
...
Refactor New() proc of vending machines.
2015-03-17 17:10:12 +11:00
Jordie
cb9d49ab02
Merge pull request #8359 from xxalpha/stackfix
...
Fixes several zero amount stack bugs.
2015-03-17 17:10:04 +11:00
Jordie
0850fc626e
Merge pull request #8358 from CandyClownTG/patch-1
...
Update fancy.dm
2015-03-17 17:09:37 +11:00
Iamgoofball
7600697c13
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
2015-03-16 21:13:56 -07:00
MrStonedOne
734640b43b
fixes issue with admin preferences applying to non-admins
...
fixes issue with admin preferences applying to non-admins.
This is a preference that only admins can change, but if a users save file gets fucked, or a admin who turned it off gets de-admined. it still applies to them.
I don't know why this even exists, it seems to have been around since google code, maybe even since goonleak, but it should be checking for admin before applying to peoples nonetheless.
2015-03-16 13:08:54 -07:00
Jordie
9c148ff13e
Merge pull request #8315 from phil235/BigUserdanger
...
Makes the message when you're attacked slightly bigger
2015-03-16 18:30:21 +11:00
pudl
485231c7f8
security officers once again have the choice of a normal headset
2015-03-15 23:32:54 -05:00
phil235
e104508a92
Refactor New() proc of vending machines.
...
Fixes spawned vending machine being empty (constructable or not).
2015-03-16 03:04:35 +01:00
phil235
d7f29d770c
Merge pull request #8113 from Xhuis/boom_boom_shake_the_room
...
Restores gibbing for suicide C4
2015-03-15 22:50:12 +01:00
xxalpha
c9d600e653
Fixes stack duping.
2015-03-15 19:04:07 +00:00
phil235
78d28a6d64
Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger
...
Conflicts:
code/modules/events/ninja.dm
2015-03-15 12:30:27 +01:00
Cheridan
cb07696814
Merge pull request #8319 from MMMiracles/bearpelts4everyone
...
Ability to put bears on meat spikes.
2015-03-15 02:34:07 -05:00
Cheridan
da1e6f57f0
Merge pull request #8334 from MrPerson/cleanup_crew_comin_through
...
Code cleanup
2015-03-15 01:55:39 -05:00
MMMiracles
abb835b487
revamps ERT hardsuits to use the helmet toggle, organizes the listing to be slightly better looking.
2015-03-15 02:03:18 -04:00