Remie Richards
|
d524b4acde
|
Adds a special camera that can see ghosts (if the ghost is orbiting something they are skipped, this is to prevent it being used for power/meta gaming) the Chaplain spawns with one and they can be tablecrafted using a camera and holywater
|
2015-10-24 00:53:36 +01:00 |
|
phil235
|
5ab3ad56db
|
Merge pull request #12557 from RemieRichards/Ports-GoonTooltips-ByWireWraith
Ports goon tooltips made by Wirewraith
|
2015-10-23 22:16:22 +02:00 |
|
phil235
|
8f45876c96
|
Merge pull request #12499 from Shadowlight213/memeglasses
Adds an override var to glasses to allow them to see higher invis levels
|
2015-10-23 20:47:42 +02:00 |
|
Cheridan
|
89680225c0
|
Merge pull request #12590 from phil235/TransferAmountFix
Fixes changing transfer amounts not working for shaker
|
2015-10-23 13:33:13 -05:00 |
|
Razharas
|
62b4177b22
|
Merge pull request #12455 from TheDreamweaver/master
Dwarves can crawl on tables like monkeys
|
2015-10-23 20:52:01 +03:00 |
|
Remie Richards
|
5f96e49f93
|
Merge pull request #12541 from Anonus/bringing_spooky_back
Once again overhauls revenants
|
2015-10-23 18:12:15 +01:00 |
|
Nerd Lord
|
86aa4a49cd
|
World.timer is go.
|
2015-10-23 13:06:18 -04:00 |
|
Jordie
|
da08741d8a
|
Merge pull request #12578 from Anonus/scannerswap
Swaps the scanner and photocopier icons
|
2015-10-24 03:08:28 +11:00 |
|
WJohn
|
3cf911c0f8
|
Merge pull request #12596 from Anonus/nutrivend
Fixes a few more dreamstation issues
|
2015-10-23 11:46:33 -04:00 |
|
Cheridan
|
ff05c5323f
|
Merge pull request #12583 from Steelpoint/Beret
[NERF/ARMOUR] Lowers Sec Beret Defence To Helmet Value
|
2015-10-23 08:04:56 -05:00 |
|
Razharas
|
b5120f0276
|
Merge pull request #12555 from Jordie0608/notallsyndicatescanaffordanukedonateyourstodayandyoucanhelpaspacestationbedestroyed
Syndie nuke and closet mapped to shuttle
|
2015-10-23 12:29:44 +03:00 |
|
Cheridan
|
bbd9c8bcc2
|
Merge pull request #12553 from KorPhaeron/scanners
Removes research scanners from cyborgs
|
2015-10-23 00:45:22 -05:00 |
|
sybil-tgstation13
|
29f428928e
|
Automatic changelog compile
|
2015-10-23 04:35:25 +00:00 |
|
Cheridan
|
dbede6acc5
|
Merge pull request #12580 from Anonus/maxgib
New Max and Gib gang tags
|
2015-10-22 22:46:16 -05:00 |
|
Jordie0608
|
0dd8027380
|
rogue line diff fix?
|
2015-10-23 14:14:19 +11:00 |
|
Jordie0608
|
e90213db8e
|
parts maps to avoid conflicts
|
2015-10-23 13:45:06 +11:00 |
|
Nerd Lord
|
d05c81c2d9
|
This should resolve conflicts and not fail to compile woo woo
|
2015-10-22 22:10:29 -04:00 |
|
Cheridan
|
6bfa738a24
|
Merge pull request #12567 from phil235/EffectSystemTweak
Makes effect system code more OOP.
|
2015-10-22 21:00:10 -05:00 |
|
TheDreamweaver
|
4e72f1df3a
|
Update mutations.dm
|
2015-10-22 18:56:36 -07:00 |
|
Remie Richards
|
2ad13eea59
|
Updates ToolTips system to V1.1, by Wirewraith
|
2015-10-22 21:40:16 +01:00 |
|
Nerd Lord
|
d8edc80a3a
|
Retiles the entire mining zlevel out of spite. It is now brown and purple, aligning as strictly as possible to a specific placement guide.
Also fixed an issue on the main station but I forgot what it was already.
|
2015-10-22 15:11:29 -04:00 |
|
WJohn
|
5479608013
|
Merge pull request #12538 from lzimann/asteroid
Small fixes to asteroid!
|
2015-10-22 15:07:49 -04:00 |
|
Nerd Lord
|
9148f8d0d7
|
Fixes a few issues, including nuke ops not getting a nuke, a lack of nutrivend, and some airless tiles that didn't show up on roundstart active turfs.
|
2015-10-22 14:27:08 -04:00 |
|
phil235
|
be4b3a6857
|
Merge pull request #12478 from Firecage/Mirrorfixing
Adds fixing mirrors.
|
2015-10-22 19:16:55 +02:00 |
|
Firecage
|
40b149ade7
|
Removes one indent from the return.
|
2015-10-22 19:11:23 +02:00 |
|
phil235
|
50467f672b
|
Merge pull request #12592 from phil235/GunNameChange
Changed a few gun names
|
2015-10-22 18:59:21 +02:00 |
|
KorPhaeron
|
520fedd2cf
|
Changed a few gun names
|
2015-10-22 18:52:40 +02:00 |
|
phil235
|
564857d3c9
|
Fixes changing transfer amounts not working for shaker, drinking glass and condiment bottle. And remove it from damp rag and shot glass, since they only have one possible tranfer amount. Fixes the shaker's name being capitalized for no reason (and without an \improper ).
|
2015-10-22 18:40:32 +02:00 |
|
Jordie0608
|
0d67f24e33
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into notallsyndicatescanaffordanukedonateyourstodayandyoucanhelpaspacestationbedestroyed
Conflicts:
_maps/map_files/DiscStation/DiscStation.dmm
|
2015-10-23 01:01:02 +11:00 |
|
phil235
|
c7670dc627
|
Merge pull request #12558 from Bawhoppen/medbaysigntypo1
Fixes medbay sign description typo
|
2015-10-22 12:41:26 +02:00 |
|
phil235
|
8fb8f61674
|
Merge pull request #12413 from Shadowlight213/Youknowthetruthanditwearscatears
Enables job restrictions for roundstart catpeople even if the config is off
|
2015-10-22 12:25:32 +02:00 |
|
Steelpoint
|
23f4ee77ea
|
BeretChange
|
2015-10-22 15:08:40 +08:00 |
|
Razharas
|
467b28d263
|
Merge pull request #12533 from Jordie0608/ghoststoocannowenjoypointlessexposition
Local narrate to all mobs
|
2015-10-22 09:47:09 +03:00 |
|
Razharas
|
dcac36e4a9
|
Merge pull request #12544 from Strathcona/DiscstationHotfix3
Discstation Hotfix #3
|
2015-10-22 09:34:08 +03:00 |
|
Razharas
|
e1bad58c4a
|
Merge pull request #12503 from Robustin/master
Pneumatic Nerf
|
2015-10-22 09:33:02 +03:00 |
|
Razharas
|
7ce5b8a42b
|
Merge pull request #12492 from optimumtact/patch-1
Brings some sanity to do_after and do_mob
|
2015-10-22 09:32:24 +03:00 |
|
Nerd Lord
|
7a90de04cf
|
After FIVE YEARS of waiting, two new gang tags for Max and Gib gangs.
|
2015-10-21 23:52:25 -04:00 |
|
Nerd Lord
|
8c4aa74be6
|
Swaps the scanner and photocopier icons because goddamn the new one really bugs me I'm gonna have the librarian deal with it instead
|
2015-10-21 22:53:26 -04:00 |
|
Nerd Lord
|
773649067d
|
/span>
|
2015-10-21 22:41:23 -04:00 |
|
Cheridan
|
ecdaeaad4c
|
Merge pull request #12540 from Incoming5643/this_blows
Syndicate bomb payloads will now detonate if set on fire
|
2015-10-21 19:11:05 -05:00 |
|
Cheridan
|
fd09e91f4c
|
Merge pull request #12522 from optimumtact/readds_paralyse_sting
Readds the parasting
|
2015-10-21 19:06:19 -05:00 |
|
Cheridan
|
3128680825
|
Merge pull request #12547 from optimumtact/patch-3
removes comments that do not contribute to code understanding
|
2015-10-21 19:01:36 -05:00 |
|
phil235
|
fb7ad8b38f
|
Merge pull request #12452 from Xhuis/radical
Radiation tweaks and a geiger counter
|
2015-10-22 01:13:00 +02:00 |
|
phil235
|
1ba304065b
|
Merge pull request #12521 from optimumtact/why
Remove some more dead code
|
2015-10-22 00:52:14 +02:00 |
|
phil235
|
e85ae646a3
|
Merge pull request #12524 from kingofkosmos/newphotocopiericon
New photocopier icon
|
2015-10-22 00:51:10 +02:00 |
|
phil235
|
e8d5a4cbf8
|
Merge pull request #12532 from Jordie0608/inb4prgets100comments
Makes blue cherry more blue
|
2015-10-22 00:50:03 +02:00 |
|
phil235
|
02bccf6cf8
|
Merge pull request #12536 from tgstation/RemieRichards-DroneHatFix
Fixes drone hats
|
2015-10-22 00:49:17 +02:00 |
|
phil235
|
afde447481
|
Merge pull request #12523 from MrStonedOne/patch-49
Fixes spiders locking up the MC with do_after's
|
2015-10-22 00:48:36 +02:00 |
|
phil235
|
4d3449dc63
|
Merge pull request #12513 from bgobandit/iamaclown
Fixes bio-bags not showing up where they're supposed to.
|
2015-10-22 00:47:56 +02:00 |
|
phil235
|
261ee72cce
|
Merge pull request #12511 from KorPhaeron/icon
Fixes icon not updating when you craft an explosive lance
|
2015-10-22 00:47:31 +02:00 |
|