108a8cc155
Merge pull request #6473 from Delimusca/grenadeinhands
...
Fixes grenades looking like flashes.
2014-12-22 11:10:05 -08:00
126be2f312
Merge pull request #6483 from MrPerson/storage_war_hunter_kings
...
Always reset the layer of things removed from storage
2014-12-22 10:42:48 -08:00
c002d11ee7
Merge pull request #6476 from Cheridan/nightcrawler
...
Refactors snowflake AI hosting in ninja
2014-12-21 17:02:48 -08:00
2f3bceb79c
Merge pull request #6445 from phil235/GiveLightCig
...
Refactoring cigarette lighting and esword activation a bit.
2014-12-21 05:27:30 -08:00
5a48f313cb
Merge pull request #6399 from paprka/radioshit
...
Removes useless standard encryption keys from headsets
2014-12-21 05:08:10 +00:00
80a4bc285d
Adds empgrenade inhand, removes missed comment
2014-12-19 18:11:27 -07:00
2b763f18c1
Always reset the layer of things removed from storage
...
Fixes #6470
2014-12-19 09:42:06 -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
25cc2999b0
Refactors snowflake AI hosting in ninja
...
why did i volunteer for this
It just has an integrated intellicard now. The gloves do the transferring.
Also Intellicards are all called Intellicards now and not Intelicards.
the ai_transfer proc is less awful but it's still
awful
awful awful awful
2014-12-18 21:03:09 -06: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
332cc37b13
Added grenade inhands.
2014-12-18 17:58:43 -07:00
4bdf83c59f
Revert "adds grenade inhands."
...
This reverts commit d1295616c8
2014-12-18 17:27:01 -07:00
d1295616c8
adds grenade inhands.
2014-12-18 16:57:47 -07:00
ac5c322327
Merge pull request #6434 from paprka/singulobombing
...
Fixes singulo bombing
2014-12-18 10:39:57 -08:00
25188e441b
Little fix.
2014-12-18 18:00:17 +01: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
e132f206cf
derp.
2014-12-17 22:47:50 +01:00
bbb8eae106
Adding candle, flare and torch to is_hot() proc, fixing energy/blade returning false for it.
...
Refactoring cig lighting code a bit.
Refactoring the attack_self() procs of weapon/melee/energy and its children.
Fixed energy axe suicide code typo.
Energy axe now makes noise when toggle on/off, just like esword.
2014-12-17 22:32:40 +01: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
93166940f7
fixes singulo bombing
2014-12-17 02:25:33 -08:00
d5a7d82959
Fixes a lot of "the the" in messages.
2014-12-16 22:59:55 +01: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
9b050ff010
removes meta protection from binary translator key
2014-12-16 00:37:54 -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
881fd8eaee
Merge pull request #6223 from Ergovisavi/back_slot_toggle_items_fixes
...
Fixing issues and updating equip method for Watertank Backpack / Defib
2014-12-15 16:24:58 -08:00
a1f263ec67
Merge pull request #6364 from phil235/DefibMessageColorFix
...
Changes defibrillator success/failure messages color
2014-12-15 16:18:42 -08:00
feeb650701
Removes useless standard encryption keys from headsets
2014-12-15 14:59:19 -08:00
d5d7b7f4d7
Fix of c4 not deleting on signaler explosions
...
Fixes #6393
2014-12-16 00:47:09 +03:00
4f026fc324
Fixes the welder's onmob sprite not updating when turning off due to lack of fuel. Fixing experimental weldingtool having an invisible sprite.
2014-12-15 16:45:10 +01:00
b143e41b88
Merge pull request #6265 from Miauw62/HOHOHO
...
SANTA IS COMING TO STATION
2014-12-14 23:58:28 -06:00
f9eacb4498
Merge pull request #5854 from A4Brogan/Ghetto_Banana_Lamp
...
Ghetto Banana Lamp
2014-12-14 23:51:18 -06:00
fd550c82ff
Prevent using the hand teleporter from inside closets and when under the influence of a chameleon projector.
2014-12-15 00:08:03 +01:00
027ce2a1df
Changes defibrillator success/failure messages from using boldnotice span class to using notice span class for success and warning span class for failure.
2014-12-14 17:32:03 +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
0b26a71a71
Merge pull request #6333 from tkdrg/singulobj
...
The singularity/narsie are no longer machines
2014-12-14 10:02:39 +03:00
bafef911d4
Merge pull request #6317 from paprka/saltyfuckingcuntm8
...
Security aesthetic overhaul
2014-12-14 07:57:33 +03:00
3bd3175a18
Removed unused armbands
2014-12-13 00:14:03 -08:00
c104ad6cd4
Merge pull request #6323 from AndroidSFV/fix6313
...
Fixes 6313
2014-12-12 23:01:43 -06:00
79e8ad4142
The singularity/narsie are no longer machines
2014-12-12 19:42:37 -03:00
3a0927febd
Fixes 6313
2014-12-12 11:16:54 -06:00
98a865298a
Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor
...
Conflicts:
code/game/mecha/mech_fabricator.dm
2014-12-11 13:53:37 -08:00
e9477cfe9d
initial commit for better security clothing
2014-12-11 11:50:52 -08:00
27793609d8
Merge pull request #6201 from fleure/togglefix
...
Fixes toggling watertank nozzle in hands with verb
2014-12-11 12:21:32 -06:00
hornygranny
MrPerson
Remie Richards
Delimusca
tkdrg
Cheridan
phil235
Cheridan
paprka
Cuboos
Razharas
KyrahAbattoir
Razharas
AndroidSFV