Jon
9f2ec9c163
Adds three new hair flower pins - yellow, blue, and pink.
...
All three have the same on-ear/head sprite as the current red hair flower pin, but a different in hand sprite.
The red flower pin should remain untouched and is still "hairflower", with the new colours being subtypes.
2015-10-11 00:26:54 -04:00
Neerti
bbe8c336b2
Adds socks.
...
Conflicts:
code/modules/client/preferences_savefile.dm
2015-10-11 00:13:33 -04:00
Neerti
e52a0ea332
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
...
Conflicts:
.travis.yml
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/turfs/simulated.dm
code/global.dm
icons/misc/fullscreen.dmi
polaris.dme
2015-10-10 23:17:26 -04:00
GinjaNinja32
ace1874f37
Merge pull request #11241 from Hubblenaut/light_replacer
...
Amendments to light replacer
2015-10-09 11:35:13 +01:00
PsiOmegaDelta
8341620be4
Merge pull request #11246 from Kelenius/blobPlzGo
...
Updates blob
2015-10-08 07:58:15 +02:00
Hubblenaut
a7cad04264
Amendments to light replacer and janitor supply crate
2015-10-06 19:59:56 +02:00
Kelenius
83adba88d4
Updates blob
...
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106 .
Fixes #10705 .
2015-10-05 18:10:16 +03:00
Zuhayr
e8196675e0
Merge pull request #11228 from Vivalas/dev
...
Adds in AcmeCo brand explosive cigarettes.
2015-10-06 00:42:43 +10:30
Vivalas
0bf5145e24
Name change
2015-10-01 13:35:26 -05:00
Vivalas
d2c355a937
Adds in KillerKickthroats
2015-09-30 17:56:35 -05:00
Vivalas
8b6650d217
Briefcase Fix
2015-09-30 17:10:57 -05:00
PsiOmega
63de1764c3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-27 13:48:33 +02:00
PsiOmega
807e7bf954
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/spells/artifacts.dm
2015-09-27 13:36:56 +02:00
mwerezak
03cb79a85d
Merge pull request #11187 from PsiOmegaDelta/150925-Destruction
...
Destroy tweaks.
2015-09-26 20:22:01 -05:00
mwerezak
21f679ea8f
Merge pull request #11191 from PsiOmegaDelta/150925-RadioActivity
...
Makes more sources of radiation respect rad-protection.
2015-09-26 20:10:47 -05:00
Joseph Heinemeyer
9e9df0a15d
Delete ladders.dm
2015-09-26 17:43:52 -07:00
Hubblenaut
f0481b551e
Fixes grab-buckling overwriting pixelshift
2015-09-26 14:11:01 +02:00
PsiOmega
a3b9ab1236
Makes internal radiation sources also use apply_effect(), by utilizing the ability to ignore radiation protection.
2015-09-26 09:19:58 +02:00
Chinsky
dbbf6bb11e
Merge pull request #11158 from PsiOmegaDelta/150920-MoreGlow
...
Glowy items.
2015-09-25 15:03:39 +03:00
Chinsky
407f5bbac3
Merge pull request #11182 from Hubblenaut/dev
...
Lowers the belt layer to below suit
2015-09-25 11:45:57 +03:00
PsiOmegaDelta
9dd1a54191
Destroy tweaks.
...
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091 .
Adds returns in Destroy()s, to prepare for future return values.
2015-09-25 10:44:23 +02:00
Hubblenaut
8d3519e24b
Belt layer below suit layer, belts toggleable
2015-09-24 17:48:14 +02:00
Chinsky
60a925422f
Merge pull request #11167 from PsiOmegaDelta/150921-ColorCleanup
...
Floor painter, turf, and decal tweaks.
2015-09-24 15:27:58 +03:00
PsiOmega
de2e9e2d9a
Odd typo fixes.
2015-09-21 20:31:47 +02:00
PsiOmega
38c0251b6d
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-21 17:35:49 +02:00
PsiOmega
5b4c7340e4
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-09-21 17:26:19 +02:00
PsiOmegaDelta
8a1b414e28
Floor painter, turf, and decal tweaks.
...
Makes several custom color definitions, utilized by the floor painter, floor tiles, decals, etc.
Colored floor turfs now use a white icon state and applies a color, similar to the corresponding decals. This ensures they have the same color tone (was slightly off previously).
Colored floor tiles also use a white icon state and color application.
Removes now unused item states.
2015-09-21 15:14:13 +02:00
Zuhayr
7d7f0da2ca
Merge pull request #11156 from PsiOmegaDelta/150920-PunPunOnTheTable
...
Species tweaks
2015-09-21 19:08:53 +09:30
Chinsky
5243626724
Merge pull request #11157 from PsiOmegaDelta/150920-ThunderdomeExclamationmark
...
Map tweaks.
2015-09-21 11:49:47 +03:00
Hubblenaut
ced4ce268c
Adds Syndicate ID sprite
2015-09-20 21:11:49 +02:00
PsiOmegaDelta
4cc2b1a93e
Glowy items.
...
Energy shields now glows slightly stronger than stunbatons when active.
2015-09-20 18:18:19 +02:00
PsiOmegaDelta
7d975aa36f
Map tweaks.
...
Adds a couple of decals to the Thunderdome.
Rotates sleepers/scanners on z-level 1 and 2. Had already done so for z-level 5. Fixes #11058 .
Full tile windows no longer appear to exist? Replaces the glass on the toxin test site with reinforced glass spawners.
2015-09-20 17:59:57 +02:00
PsiOmegaDelta
d891fba1cc
Mob size tweaks.
...
Merges the use of the is_small and mob_size into one.
Changes the species size handling to set the mob size instead of being yet another separate var to check.
2015-09-20 17:12:07 +02:00
PsiOmegaDelta
59c5807157
Active stunbatons now glow.
2015-09-19 21:12:19 +02:00
Hubblenaut
4eef7ab65d
Fixes beds occasionally buckling in odd directions
2015-09-19 15:27:24 +02:00
PsiOmega
5863112d2d
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/spacesuits/rig/rig.dm
2015-09-15 20:31:59 +02:00
PsiOmega
5c1b8380a4
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/tanks/jetpack.dm
code/game/objects/items/weapons/tanks/tanks.dm
2015-09-15 20:25:13 +02:00
GinjaNinja32
6a61269edd
Merge pull request #11106 from Kelenius/jetpackFixes
...
Fixes for jetpacks and gas tanks
2015-09-15 15:06:58 +01:00
Kelenius
baebd62c26
Fixes tank examine()
2015-09-15 10:14:07 +03:00
mwerezak
db95743784
Merge pull request #11105 from PsiOmegaDelta/150914-ForcedWheelchair
...
Converts some loc = to forceMove()
2015-09-14 12:11:09 -04:00
Kelenius
3c4369823f
Fixes for jetpacks
...
Jetpacks now GC; CO2 jetpacks no longer pointlessly create a datum that
is already created in the parent; CO2 jetpacks can be properly examined;
removes text() and adds spans and \the.
2015-09-14 16:35:52 +03:00
PsiOmegaDelta
bb5680193f
Converts some loc = to forceMove()
...
Fixes #11102 .
2015-09-14 11:13:15 +02:00
PsiOmega
0d91ca0dfd
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
2015-09-13 10:52:01 +02:00
PsiOmega
830d2feb0d
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
code/game/objects/structures/crates_lockers/largecrate.dm
2015-09-13 10:44:06 +02:00
PsiOmega
0c21ef741e
Fixes #10988 .
...
Lights now update when objects are moved into crates and lockers.
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1926 .
2015-09-12 20:43:24 +02:00
PsiOmegaDelta
a7fa8cde49
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/spacesuits/void/merc.dm
code/modules/mob/living/living.dm
code/modules/mob/living/simple_animal/borer/borer_captive.dm
code/modules/mob/mob_grab_specials.dm
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
html/changelogs/.all_changelog.yml
2015-09-11 08:54:03 +02:00
PsiOmegaDelta
0b433eb90c
Code relocation.
2015-09-11 08:45:49 +02:00
PsiOmegaDelta
f81ac77884
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/silicon/ai/ai.dm
2015-09-11 08:38:28 +02:00
Vivalas
ae5810d6ed
Fixes #10729
2015-09-10 13:50:24 -05:00
mwerezak
f69c723d40
Made flares a bit brighter
2015-09-09 20:42:40 -04:00
