9d7567f46d
Adds cfg option to let players see their own notes
...
This lets players see the admin notes that have been added to their
ckey, by using a verb in the OOC tab.
This is a config option and is off by default.
2014-12-19 22:42:18 -03:00
579f297076
Merge pull request #6444 from tkdrg/shardopplsnerf
...
Tweaks the Supermatter a bit
2014-12-19 14:57:22 -08:00
d7e05d4387
Adds Supermatter logging and tweaks the power gen
...
Now includes an admin_investigate entry, plus three message_admins():
when first powered, when first reaching critical point, and when a mob
is dusted. Also tweaks the power generation formula a bit.
2014-12-19 18:19:48 -03:00
166778d43e
Merge pull request #6459 from MrPerson/ninja_rewrite
...
Removes a bunch of commented out code from ninja.dm
2014-12-19 10:48:51 -08:00
fd91a91fbe
Merge pull request #6461 from tkdrg/floorpath
...
Fixes airless floor path
2014-12-19 10:48:20 -08:00
0600ad6948
Merge pull request #6462 from phil235/BearTrapRemovalFailMsg
...
Fixes handcuff/legcuff/beartrap removal fail message
2014-12-19 10:47:41 -08:00
f1963ce537
Merge branch 'master' of https://github.com/tgstation/-tg-station into parahats
...
Conflicts:
code/modules/clothing/head/soft_caps.dm
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2014-12-19 10:41:27 -08:00
f1101f77a9
Adds 3 more scarves
...
These striped scarves are made by MrSnapwalk. They are included in the
ClothesMate along with the other scarves (sprited by Nienhaus). These
have a striped texture.
2014-12-19 00:24:01 -03:00
d44fa004b0
Merge branch 'master' into scarfs
...
Conflicts:
icons/obj/clothing/ties.dmi
2014-12-18 23:35:15 -03:00
eaec9a6e1b
9 more scarves and small corgi cleanup
...
Adds 9 more scarves (light blue, dark blue, orange, yellow, purple,
white, black, zebra and christmas).
Cleaned up corgi code a little bit, specially the parts involving icon
updates. Fixes a bug where adding a hat to a dead corgi didn't make you
drop your hat and created duplicate items. Makes corgis only use one
head/back mob sprite and rotate it appropriately. Call
regenerate_icons() only when needed now, instead of doing so every tick
on Life().
2014-12-18 23:09:49 -03:00
ac036c9fca
Fixes airless floor path
...
I missed these when repathing floors. Whoops.
This PR doesn't update asteroid station. Its maintainers will need to
fix it themselves.
Fixes #6453
2014-12-18 17:31:28 -03:00
ac5c322327
Merge pull request #6434 from paprka/singulobombing
...
Fixes singulo bombing
2014-12-18 10:39:57 -08:00
ca3df3b4a1
Fixes handcuff/legcuff/beartrap removal fail message appearing many seconds after the actual fail. It will now appear twice as fast.
...
Replacing two usr.
Fixing being able to remove both handcuff and legcuff by resisting once.
2014-12-18 17:42:42 +01:00
81591498ca
Removes a bunch of commented out code from ninja.dm
2014-12-18 07:29:16 -08:00
c9c14feec6
Merge pull request #6411 from wild-billy/master
...
Reserve PascalCase inits
2014-12-18 02:30:08 -06:00
566066a73a
Merge pull request #6441 from paprka/corpsecthecorpening
...
Corporate Security aesthetic update
2014-12-18 02:14:33 -06:00
9d46ccceac
old warden jacket for the lockers
2014-12-17 23:01:10 -08:00
0976cde773
updates ian so he can use civillian armor instead of sec armor
2014-12-17 18:13:24 -08:00
62b99c7007
Adds scarfs
...
These come in red and green, and can be equipped in the tie slot.
They are available from the ClothesMate vendomat. Sprites by Nienhaus.
2014-12-17 19:19:15 -03:00
62252f0273
Merge pull request #6420 from phil235/TypoFix2
...
Fixes a lot of "the the" in messages.
2014-12-17 16:06:35 -06:00
c0fb78edd5
Tweaks the Supermatter a bit
...
Reduces the amount of heat and power released. Removes redundant code.
2014-12-17 16:06:33 -03:00
97794c4035
Merge pull request #6383 from kyrahabattoir/HandTeleExploit
...
Prevent using the hand teleporter from inside closets and when under the...
2014-12-17 11:06:21 -08:00
ceea358967
Merge pull request #6397 from Razharas/C4fix
...
Fix of c4 not deleting on signaler explosions
2014-12-17 11:05:42 -08:00
efc3570135
Merge pull request #6396 from phil235/WelderSpriteUpdateFix
...
Fixes the welder's onmob sprite not updating when turning off
2014-12-17 11:04:54 -08:00
5a26db0285
Merge pull request #6401 from Menshin/solars_runtime_fix
...
Fixes controless solar tracker runtime
2014-12-17 11:04:29 -08:00
7ea29f961e
Merge pull request #6404 from tkdrg/moarfuntiems
...
Fixes 2 runtimes
2014-12-17 11:03:41 -08:00
a6e12c2ea9
warden bug, warden belt, backpacks
2014-12-17 09:19:04 -08:00
4075e59e04
corporate security initial commit
2014-12-17 08:14:22 -08:00
82654b579a
Merge pull request #6395 from Steelpoint/master
...
Security Beret + Jumpsuit Sprites
2014-12-17 13:53:45 +03:00
93166940f7
fixes singulo bombing
2014-12-17 02:25:33 -08:00
f0d80d487d
adds EMT caps
2014-12-16 21:04:27 -08:00
d5a7d82959
Fixes a lot of "the the" in messages.
2014-12-16 22:59:55 +01:00
8d649f60d7
Merge pull request #6365 from phil235/StraightJacketRemovalFix
...
Fixes being able to remove clothing while straightjacketed or handcuffed
2014-12-16 11:02:43 -08:00
fd7d6f733f
Merge pull request #6053 from phil235/LightMatchFix
...
Fixing not being able to light a cigarette in someone's mouth with a lit match
2014-12-16 12:40:49 -06:00
79af296b6d
Merge pull request #6366 from phil235/ChairSpinningFix
...
Fixes not being able to rotate your chair while buckled to it.
2014-12-16 12:27:35 -06:00
c021bda843
Merge pull request #6250 from tkdrg/CRYSTAL-DELAMINATION-IMMINENT
...
Ports the supermatter engine from /vg/
2014-12-16 15:26:36 +00:00
2cbcda1a5f
Merge pull request #5702 from Donkie/traylayer
...
Morgue/Crematorium update
2014-12-16 14:27:49 +01:00
672b476f23
Tidying a little
2014-12-16 13:16:19 +01:00
66d36f74d2
Reserve PascalCase inits
2014-12-16 12:29:04 +02:00
fb5eeb4265
HoP/BartenderArmor
2014-12-16 15:35:49 +08:00
d4c2cc3b64
MapChanges/ArmourSpriteChanges
2014-12-16 11:48:06 +08:00
bb273c5034
path fixes
2014-12-15 18:40:50 -08:00
e91796d59c
proper sound changes
2014-12-15 18:36:19 -08:00
7288f865fe
undoes tortoisegit merge fuckery
2014-12-15 18:23:50 -08:00
0bb7d2a5a5
Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1
...
Conflicts:
code/game/objects/items/weapons/defib.dm
config/admins.txt
2014-12-15 18:12:14 -08:00
3e90c2863e
Fixes 2 runtimes
...
Fixes antag hud runtime due to checking the mind before transferring it.
Fixes floorbot runtime due to typecasting with no sanity checks.
2014-12-15 22:30:23 -03:00
4ceaa597ab
Merge pull request #6385 from phil235/UsedSlimecoreFridgeFix
...
Fixes not being able to remove used slime extract from smartfridge
2014-12-15 16:28:39 -08:00
5dd86ab53d
Merge pull request #6370 from Xhuis/monkeying_around
...
Fixes monkeys being able to read books
2014-12-15 16:27:51 -08:00
c5ba564993
Merge pull request #6374 from phil235/SneezingSpreadFix
...
Fixing sneezing symptom not spreading its virus airborne.
2014-12-15 16:27:27 -08:00
4ef5afbc67
Merge pull request #6371 from phil235/VentcrawlStunFix
...
Fixes monkey being able to ventcrawl if stunned after initial altclick
2014-12-15 16:27:11 -08:00
tkdrg
hornygranny
paprka
phil235
MrPerson
Cheridan
Razharas
Remie Richards
Swag McYolosteinen
Menshin
Wild Bill
Steelpoint
Cuboos