Razharas
|
4c3f83d085
|
This shall fix the hunger system
I really really hope it does
|
2014-12-28 21:51:28 +03:00 |
|
Razharas
|
76a21883a8
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
Conflicts:
code/game/mecha/mecha.dm
code/game/objects/structures/tables_racks.dm
code/modules/mob/living/silicon/silicon.dm
code/modules/projectiles/gun.dm
Fixes dem conflicts
|
2014-12-28 11:20:15 +03:00 |
|
Razharas
|
208b59c30e
|
Fixed stuff tkdrg pointed out
Added comment to dualsaber and hulk checks to explain whats going on
Added defines that converts to mutation names
Fixed grammer again
|
2014-12-28 10:49:04 +03:00 |
|
tkdrg
|
5074b76a1e
|
Merge pull request #6609 from Jordie0608/endcaptaininequality2015
Added log to RC announcements
|
2014-12-28 02:39:37 -03:00 |
|
tkdrg
|
bf25d38fb2
|
Merge pull request #6607 from paprka/aiturrets
Fixes ai turrets having disable mode instead of stun
|
2014-12-28 02:21:04 -03:00 |
|
paprka
|
e33d2c02bc
|
fixes ai turrets for real this time
|
2014-12-27 21:12:48 -08:00 |
|
tkdrg
|
c57c75b232
|
Merge pull request #6604 from paprka/disablerhitsound
Disabler now makes a sound when it hits
|
2014-12-28 02:06:55 -03:00 |
|
tkdrg
|
60fc73d018
|
Merge pull request #6587 from phil235/MonkeyBiteMaskFix
Fixes being able to bite as a monkey with your mouth covered by a mask.
|
2014-12-28 01:01:14 -03:00 |
|
Ergovisavi
|
ff68a2d55b
|
Merge pull request #6490 from tkdrg/nomoreadmingrudges
Adds cfg option to let players see their own notes
|
2014-12-27 19:25:43 -08:00 |
|
Swag McYolosteinen
|
4205b8d531
|
Merge pull request #6620 from Menshin/missed_designs
Fixes missing designs for the protolathe construction
|
2014-12-27 20:35:08 +01:00 |
|
tkdrg
|
cc474b2af6
|
Merge pull request #6591 from phil235/FingerlessSpriteFix
Fix fingerless gloves icon and washing machine changing boxing gloves
|
2014-12-27 15:46:43 -03:00 |
|
tkdrg
|
7f7fad7ac9
|
Merge pull request #6586 from phil235/ResonatorTableFix
Fixes the resonator being activated when placed on a table/closet/storage
|
2014-12-27 15:06:36 -03:00 |
|
phil235
|
f8b7a2066f
|
Merge pull request #6559 from tkdrg/hal
Adds sanity checks to supermatter Consume()
|
2014-12-27 18:42:01 +01:00 |
|
phil235
|
a614839f82
|
Merge pull request #6573 from paprka/fixescaps
Fixes capgun ammo sprites
|
2014-12-27 18:14:28 +01:00 |
|
Menshin
|
9d430e1470
|
Done some missed designs for the R&D revamp.
|
2014-12-27 16:49:11 +01:00 |
|
tkdrg
|
1846489593
|
Merge pull request #6589 from phil235/SiliconPunchMsgFix
Fixes message typos
|
2014-12-27 11:48:54 -03:00 |
|
tkdrg
|
aa785d976b
|
Merge pull request #6537 from RemieRichards/get_turf_pixel
get_turf_pixel()
|
2014-12-27 11:15:08 -03:00 |
|
Remie Richards
|
b07b007d08
|
Sanity checks
|
2014-12-27 13:59:55 +00:00 |
|
tkdrg
|
517d17d9e2
|
Merge pull request #6585 from phil235/SwirlieFix
Fixed being able to spam slam someone onto a toilet during a swirlie.
|
2014-12-27 10:33:24 -03:00 |
|
tkdrg
|
e00a1b0806
|
Merge pull request #6572 from paprka/fixescargo
Removes broken tactical helmets crate
|
2014-12-27 09:45:11 -03:00 |
|
Swag McYolosteinen
|
7ee2317ec3
|
Merge pull request #6207 from phil235/RecursiveHearVisibleMessage
Mob inside something can now see visible_message()'s
|
2014-12-27 13:20:50 +01:00 |
|
Cheridan
|
cededeaa8e
|
Merge pull request #6498 from as334/MobReactions
Allows chemical reactions inside mobs
|
2014-12-27 01:20:18 -06:00 |
|
as334
|
8a9d7b12c4
|
Change the spacing.-For Cheridan
|
2014-12-27 02:09:07 -05:00 |
|
as334
|
a3e70b3cf2
|
Prevents certain chemical reactions occuring in mobs.
|
2014-12-27 01:38:31 -05:00 |
|
paprka
|
87d0cbdb2b
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into fixescargo
Conflicts:
code/modules/clothing/head/helmet.dm
|
2014-12-26 22:31:54 -08:00 |
|
paprka
|
5fb8ae35b4
|
removes tactical helmets
|
2014-12-26 22:30:24 -08:00 |
|
tkdrg
|
45904bb8a2
|
Merge pull request #6425 from JJRcop/OOCemoji
Adds emoji to OOC chat [Now with in-house sprites!]
|
2014-12-27 03:01:36 -03:00 |
|
tkdrg
|
fc7c7b520d
|
Merge pull request #6348 from paprka/highspeednodrag1v1mem80quickscopenotaser
Blood-red hardsuit usability feature and syndicate loadout adjustments
|
2014-12-27 02:59:24 -03:00 |
|
Jordie0608
|
bd358d60ee
|
Added log to announcements
|
2014-12-27 16:46:57 +11:00 |
|
Remie Richards
|
82588d43bf
|
Merge pull request #6347 from Xhuis/bzzzt
Shocking animations
|
2014-12-27 05:23:09 +00:00 |
|
Xhuis
|
9ba34b32e6
|
Fixes return() borking the code
|
2014-12-27 00:17:57 -05:00 |
|
paprka
|
ef1d60061b
|
fixes ai turrets having disabler modes
|
2014-12-26 20:52:21 -08:00 |
|
tkdrg
|
0b4261e016
|
Merge pull request #6355 from AnturK/librarian_pda
Adds Librarian PDA cartridge
|
2014-12-27 01:44:49 -03:00 |
|
paprka
|
19f9da1a99
|
disabler now makes a sound when it hits
|
2014-12-26 20:29:52 -08:00 |
|
paprka
|
109be766d6
|
fixes a few bugs
|
2014-12-26 19:23:22 -08:00 |
|
tkdrg
|
8acded6304
|
Merge pull request #6278 from Ergovisavi/muh_mobs
Mob faction cleanup / Some goliath changes / Hopefully fixing some lag
|
2014-12-26 23:23:48 -03:00 |
|
Xhuis
|
f07b250dde
|
Removes old comments and does damage immediately
|
2014-12-26 21:08:43 -05:00 |
|
Remie Richards
|
1f288f56ae
|
Merge pull request #6290 from Xhuis/porta_console
Handheld crew monitor
|
2014-12-27 01:43:42 +00:00 |
|
tkdrg
|
f0cc5cce4d
|
Merge pull request #6330 from RemieRichards/MapperFriendlySoundTrigger
Simple sound effect map object
|
2014-12-26 22:36:55 -03:00 |
|
Remie Richards
|
632ecdbd02
|
Atoms don't have clients, Revert of previous commit
|
2014-12-27 01:04:32 +00:00 |
|
Remie Richards
|
815f3700fc
|
Clientless atoms don't get sound
|
2014-12-27 01:00:50 +00:00 |
|
Remie Richards
|
344142634e
|
Merge pull request #6518 from TZK13/Chocolate-Food
Adds three new food items made with chocolate bars
|
2014-12-27 00:55:42 +00:00 |
|
Remie Richards
|
17f1e7f044
|
Merge pull request #6516 from paprka/suitcensorsv2v2
Tweaks suit sensor menu to be easier to use
|
2014-12-27 00:37:47 +00:00 |
|
tkdrg
|
188b85ae48
|
Merge pull request #5641 from MrPerson/autoghosting
Moving while dead causes you to ghost
|
2014-12-26 21:35:58 -03:00 |
|
paprka
|
615f3f3488
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into getshockednerd
Conflicts:
code/modules/mob/living/damage_procs.dm
code/modules/projectiles/projectile.dm
|
2014-12-26 16:14:19 -08:00 |
|
Remie Richards
|
84649dacd4
|
Merge pull request #6339 from tkdrg/rip'd
Ports the rapid pipe dispenser (RPD) from /vg/
|
2014-12-26 23:58:17 +00:00 |
|
tkdrg
|
fe139e437d
|
RPD tweaks
Turns the pipe modes into defines and adds some span classes
|
2014-12-26 20:50:34 -03:00 |
|
Cheridan
|
efa27af9f4
|
Merge pull request #6567 from tkdrg/verboten
Reinstates bomb capping on Supermatter shard explosions
|
2014-12-26 16:30:21 -06:00 |
|
Cheridan
|
71385308de
|
Merge pull request #6387 from Incoming5643/goodbye_my_children
Magic Mania 1.8: Summon Spells Rework and The Challenge System
|
2014-12-26 16:29:36 -06:00 |
|
Cheridan
|
08d36580ba
|
Merge pull request #6561 from paprka/manifestfixes
Expands the new player options menu
|
2014-12-26 13:22:24 -06:00 |
|