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
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
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
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
5a26db0285
Merge pull request #6401 from Menshin/solars_runtime_fix
...
Fixes controless solar tracker runtime
2014-12-17 11:04:29 -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
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
c021bda843
Merge pull request #6250 from tkdrg/CRYSTAL-DELAMINATION-IMMINENT
...
Ports the supermatter engine from /vg/
2014-12-16 15:26:36 +00:00
672b476f23
Tidying a little
2014-12-16 13:16:19 +01:00
fb5eeb4265
HoP/BartenderArmor
2014-12-16 15:35:49 +08:00
d4c2cc3b64
MapChanges/ArmourSpriteChanges
2014-12-16 11:48:06 +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
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
a9e3edbffe
Merge pull request #6359 from phil235/SlimeAttackSlimePeopleFIx
...
Fixes Slimes attacking slime people.
2014-12-15 16:26:26 -08:00
f96f222c18
Merge pull request #6358 from tkdrg/demplatings
...
Fixes being able to turn asteroid into normal turf
2014-12-15 16:25:45 -08:00
51e10e6a19
Fixes controless tracker runtime
2014-12-16 01:23:29 +01:00
1519e320ee
Merge pull request #6357 from tkdrg/funtimes
...
Fixes two runtimes
2014-12-15 10:05:38 -08:00
0864822177
Part1TestingTheWaters
2014-12-15 18:41:33 +08:00
b143e41b88
Merge pull request #6265 from Miauw62/HOHOHO
...
SANTA IS COMING TO STATION
2014-12-14 23:58:28 -06:00
753202d008
Merge pull request #6341 from paprka/gunspritefix
...
Fixes a few bugs with gun and ammo icons
2014-12-14 23:26:36 -06:00
ecba7e1283
Merge pull request #6300 from Thunder12345/grenade_slugs
...
Adds a new FRAG-12 explosive shotgun shell
2014-12-14 21:07:44 -06:00
ff36952344
Fixes not being able to remove used slime extract from the slime extract smartfridge in xenobio.
2014-12-15 01:30:18 +01:00
b67043f267
Merge pull request #6329 from phil235/HungerChange
...
Hunger change
2014-12-14 12:55:21 -06:00
dc654e74db
Removes white ian undershirt
...
As requested by the head coders. Too many ian shirts.
2014-12-14 15:21:28 -03:00
27e3640bdd
Fixes monkeys being able to read books
2014-12-14 13:06:33 -05:00
abe866f2d0
Fixes two runtimes
...
Related to issue #6351
Fixes facehuggers checking oreboxes for stat.
Fixes monkeys dropping HUDs runtime.
2014-12-14 14:40:14 -03:00
7ff196a67d
Fixes Slimes attacking slime people.
2014-12-14 16:31:28 +01:00
b983176937
Merge remote-tracking branch 'upstream/master' into fashionandfashionaccesories
...
Conflicts:
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2014-12-14 11:59:45 -03:00
412896e1a5
Fixes being able to turn asteroid into normal turf
...
Fixes #6350
2014-12-14 11:44:37 -03:00
0b26a71a71
Merge pull request #6333 from tkdrg/singulobj
...
The singularity/narsie are no longer machines
2014-12-14 10:02:39 +03:00
0b5e182a83
Merge pull request #6232 from Incoming5643/happykwanzaa
...
Don't they know it's christmas time at all?
2014-12-13 22:57:19 -08:00
bafef911d4
Merge pull request #6317 from paprka/saltyfuckingcuntm8
...
Security aesthetic overhaul
2014-12-14 07:57:33 +03:00
30cbff2802
fixes a few bugs with gun and ammo icons/obj/gun.dmi
2014-12-13 17:13:25 -08:00
tkdrg