1a311c2434
Merge pull request #8047 from optimumtact/patch-1
...
compile your shit they say
2015-03-01 06:21:11 +03:00
8d831760ee
Tweaks and fixes for the apperence window:
...
Fixes an unreported bug where all the lizardpeople were horrifying on the character preview because it wasn't rendering their tains and noses. Incidentally the proc for character previews is horrifying.
Only relevent appearence settings will appear on the appearence screen for each race.
Moves the skin tones selector to the relevent appearence settings area for humans.
2015-02-28 21:37:02 -05:00
90a2385c41
Merge pull request #8049 from TheVekter/shotglassfixv3
...
Re-adds the shot glass sprites
2015-03-01 01:47:12 +00:00
736ffafa55
Merge branch 'master' of https://github.com/tgstation/-tg-station into BlobReroll
...
Conflicts:
code/game/gamemodes/blob/blobs/blob_mobs.dm
code/game/gamemodes/blob/blobs/core.dm
2015-03-01 00:18:19 +00:00
86fa3c113c
Buffs Oxygen Blob
2015-02-28 15:49:23 -08:00
4b9bc1b233
Adds grayscale lighters and two new zippo styles.
...
Cleaned up proc.
2015-02-28 23:39:50 +00:00
4bf99e2f0a
cap. doesn't work, rip
2015-02-28 14:08:25 -08:00
a26839cde0
Adds a new ghost verb to toggle ghost visibility
...
For users who depended on the old buggy version of see darkness.
reworks seedarkness logic to mash well with the new verb, looks nicer too
2015-02-28 13:43:55 -08:00
88cc21cb6d
Merge pull request #7963 from Incoming5643/manage_ass
...
Updates Manage Job Slots to work with assistant slots
2015-02-28 21:28:44 +00:00
679c63a8ea
Merge pull request #7924 from Incoming5643/mulligan_rounds
...
Mulligan Rounds for Wizard/Blob/Malf
2015-02-28 21:27:18 +00:00
ef95d03a13
fixes runtime when client disconnects while a ghost.
2015-02-28 13:16:04 -08:00
b1f60a6114
GOONCHEM 5.5: MORE TOXINS
2015-02-28 12:26:34 -08:00
ff1a0d3ecd
Moves global var ghostimage over to a static var on ghosts
2015-02-28 10:35:20 -08:00
3b2963dcab
More changes, more bugs
2015-02-28 10:19:52 -08:00
0257dbfc9a
Fixes #772 Toggling darkness off prevents ghosts from seeing one another.
...
Abuses client.images to get around the issue with flat see_invisible scaling not allowing for both being able to see ghosts while not seeing darkness layers.
2015-02-28 10:12:16 -08:00
c4b78e37af
Merge branch 'master' of https://github.com/tgstation/-tg-station into DroneUpdate20-02-2015
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/simple_animal/friendly/drone.dm
icons/mob/head.dmi
2015-02-28 16:19:13 +00:00
8cee97f54f
Merge pull request #7942 from dannno/nothingmatters
...
THE OWL RETURNS
2015-02-28 16:06:35 +00:00
49fc3d290c
move alt_desc to obj/item/clothing
2015-02-28 11:02:58 -05:00
e2d77899fa
Change log and changes toggling ghostears to toggling ghostwhisper
2015-02-28 09:01:21 -05:00
862c66ac63
rebalances thermals
2015-02-28 05:12:27 -08:00
dab9f4c93b
rechargers start open
2015-02-28 20:02:36 +11:00
4475f541b9
Merge pull request #8033 from TheVekter/medbackpacks
...
Gives Medical professions and Botany unique backpacks and satchels
2015-02-28 08:42:20 +03:00
b95f44f235
Loads of pyrotechnics changes
2015-02-27 21:16:10 -08:00
6a4b912d3e
Pyrotechnics changes
2015-02-27 20:38:04 -08:00
926c2f7413
Merge pull request #8027 from Iamgoofball/patch-36
...
I apparently added morphine to Deus. This was not intended.
2015-02-28 07:00:27 +03:00
1b866bad83
Merge pull request #8024 from Iamgoofball/patch-35
...
Fixes the meth recipe
2015-02-28 06:59:56 +03:00
52c5abd536
Adds new backpacks to job lockers also changelog
2015-02-27 20:26:17 -06:00
b794cf5211
New Botany backpack and satchel. Also fixes satchel spawning without iconstate.
2015-02-27 20:02:24 -06:00
2a41879f8b
Merge pull request #7989 from MrStonedOne/graytideworldwide
...
Makes rainbowtide a config option.
2015-02-28 01:25:19 +00:00
7859dd2fdf
Removes Santa Hats from security wardrobe closets and other.
2015-02-28 01:01:19 +00:00
f6e18e9e45
Re-adds the shot glass sprites.
2015-02-27 17:14:50 -06:00
d56782f645
compile your shit they say
...
Don't kill me they say
2015-02-28 10:26:38 +13:00
f9ebb2cff7
Merge remote-tracking branch 'upstream/master' into traymesons
...
Conflicts:
code/modules/research/designs.dm
icons/mob/eyes.dmi
icons/obj/clothing/glasses.dmi
2015-02-27 21:15:01 +00:00
2474e84299
REALLY FIXED THIS TIME LOL
2015-02-27 15:59:50 -05:00
7d22f4bdbd
Fixes #7935 correct use of Kelvin without degrees.
2015-02-27 15:39:13 -05:00
a0e19a466f
Adds the ability to see pda messages with GhostEars toggled in deadchat. Port from bay.
2015-02-27 14:27:11 -05:00
027eccedbc
conflicts fixed
2015-02-27 14:01:42 -05:00
fa0e5344ef
Removes sugar effects.
2015-02-27 19:01:32 +01:00
5e9e6a0264
Embedded object removal added to revive() changeling revive and fleshmend
2015-02-27 17:57:22 +00:00
d2f44872aa
Adds emp, emag, and repairs for barsign.
2015-02-27 12:01:09 -05:00
b233b54cab
Merge pull request #8006 from MrStonedOne/SomeThingThatEndsInYFollowedByTwoNumbers
...
Panic bunker + new player notification configs
2015-02-27 16:17:20 +03:00
834ab51bb5
reordered cargo and service, tweaked coloring
2015-02-27 23:37:39 +11:00
1b62290572
remember to test your fixes before you act snarky
2015-02-27 04:35:46 -08:00
e0aa321ca0
Merge pull request #8037 from paprka/blackchowder
...
Fixes dark matter server crashing, retools dark matter to be less bad
2015-02-27 15:30:17 +03:00
8807c433ae
modifies dark matter
2015-02-27 04:21:56 -08:00
5938cc7325
fixes practice lasers exploding fuel tanks
2015-02-27 03:58:25 -08:00
12e4047cbe
Merge pull request #7988 from Menshin/protalathe_matcheck_fix
...
Fixes protolathe incorrectly checking material amount
2015-02-27 11:11:52 +03:00
78e504f33e
Merge pull request #7994 from Incoming5643/colormesurprised
...
Fixes podmen always being sickenly off white upon creation
2015-02-27 11:10:55 +03:00
0367c378bf
Merge pull request #8007 from Delimusca/chemheatrconstfix
...
fixes heater construction
2015-02-27 11:06:10 +03:00
a8cedc14ef
Merge pull request #7969 from optimumtact/nanouibeginnings
...
Auto load required nanoui files on client login
2015-02-27 10:36:13 +03:00
Razharas
Incoming
Remie Richards
Iamgoofball
xxalpha
MrStonedOne
danno "big fucking moron" gonzales
Mandurrrh
paprka
Jordie0608
TheVekter
Orange Borg
phil235