94de5c997e
Merge pull request #8439 from GunHog/SteelpointsSecCamsAndLights
...
Attachable Seclite & Camera to Helmet
2015-03-22 16:56:11 +11:00
773dc712ba
goofball compile
2015-03-22 00:29:14 +11:00
afa1b76cde
Merge pull request #8190 from xxalpha/cyberimplants
...
Cybernetic Implants
2015-03-21 13:19:26 +01:00
207af82c81
Changelog+
2015-03-21 11:55:44 +00:00
2271499db7
Merge pull request #8058 from Iamgoofball/explosive
...
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
2015-03-21 09:54:11 +03:00
824e929ad7
compiled
2015-03-21 17:39:29 +11:00
d851f8750d
edits and adds
2015-03-21 17:39:03 +11:00
5d1155e09e
Merge pull request #8435 from Zelacks/ChemImplantGuiFix
...
Chemical implant action button fix
2015-03-21 17:25:08 +11:00
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
d361649df5
Merge pull request #8369 from pudl/retardfix
...
normal sec headset
2015-03-21 17:23:18 +11:00
08b3f3b6d4
fixes descriptions
2015-03-20 22:26:05 -07:00
a2cb917473
initro tweaks
2015-03-20 22:03:03 -07:00
0ad731d057
Merge pull request #8344 from MMMiracles/bearfood
...
Adds 3 new bear-related foods.
2015-03-20 19:45:00 +01:00
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
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
19fc37003f
Merge branch 'bearfood' of https://github.com/MMMiracles/-tg-station into bearfood
2015-03-19 19:32:21 -04:00
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
37caee9dc7
compiled
2015-03-19 16:57:54 +11:00
b45599486e
adds new ymls
2015-03-19 16:57:01 +11:00
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
9551919970
Merge pull request #8395 from xxalpha/jetpacktrail
...
Fixes the jetpack trail animation.
2015-03-19 16:44:37 +11:00
b2953d71c7
Merge pull request #8263 from dannno/glasses
...
cosmetic glasses n shit
2015-03-19 16:44:20 +11:00
97a0d1ce07
Merge pull request #8381 from GunHog/NoMoreLightGrenades
...
Minor Experimentor relic tweaks
2015-03-19 16:44:08 +11:00
e5fdddc7d8
Merge pull request #8289 from Xhuis/alt_clicking
...
Allows alt-clicking for some stuff
2015-03-19 16:43:53 +11:00
31de411a11
Merge remote-tracking branch 'upstream/master' into cyberimplants
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/mob_defines.dm
2015-03-18 20:11:51 +00:00
7e68cf3246
Changelog.
...
Changelog2
2015-03-18 19:51:17 +00:00
4e84fac6af
Changelog.
2015-03-18 19:49:28 +00:00
f7bdba6936
Added harmless changelog
2015-03-18 16:22:03 +01:00
6cb9ec1150
Mandatory offering to Jordie (Changelog)
2015-03-18 00:38:01 -05:00
1982094795
woops
2015-03-17 22:59:50 -04:00
14c81b7032
changelog
2015-03-17 22:58:30 -04:00
f0731d01e2
changelog compiled
2015-03-17 20:03:31 +11:00
212f43e737
edit and add yml
2015-03-17 19:54:52 +11:00
7600697c13
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
2015-03-16 21:13:56 -07:00
7be631d278
fucking changelogs
2015-03-16 20:48:56 -07:00
8701459651
Fixes and changelog update
2015-03-16 20:46:51 -07:00
c86f549614
Git dat changelog!
2015-03-16 10:59:58 +00:00
ff88945418
changelog
2015-03-16 02:33:12 -05:00
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
fb6aa85094
Merge pull request #8274 from Thunder12345/techshellening
...
Shotgun party, new shells, an improvement and a fix
2015-03-16 18:30:14 +11:00
3292de067a
change log weeeeeee woooooooooooo wowoowowowow
2015-03-15 10:35:14 -04:00
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
cb07696814
Merge pull request #8319 from MMMiracles/bearpelts4everyone
...
Ability to put bears on meat spikes.
2015-03-15 02:34:07 -05:00
e7c5eb56f8
changelog compiled
2015-03-15 17:34:56 +11:00
96a415f4da
adds and edits ymls
2015-03-15 17:34:29 +11:00
7114d5ac04
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/reagents/Chemistry-Goon-Medicine.dm
2015-03-14 20:00:35 -07:00
0cdffeecfb
Merge pull request #8296 from phil235/TablecraftFix
...
Tablecraft Fix and recipe detection
2015-03-14 19:41:56 -05:00
774e4185ec
Merge pull request #8273 from Jordie0608/gamepanelmorelikelamepanel
...
Search button on game panel spawn menu
2015-03-14 23:33:46 +00:00
f552aa0ce1
Merge pull request #8222 from Incoming5643/I_dont_even_know_who_I_am_anymore
...
Magic Mania 1.855: Appearances are everything
2015-03-13 23:01:34 -05:00
ecb3a4e08f
Merge pull request #8236 from phil235/DoughChange
...
Dough change
2015-03-13 15:34:39 -05:00
Jordie