alex-gh
54db12f702
Merge pull request #206 from alex-gh/mutiny_fixes
...
Merged latest mutiny fixes.
2014-05-19 19:56:10 +02:00
alex-gh
4dc1e5c0b3
Merged latest mutiny fixes.
2014-05-19 19:54:42 +02:00
ZomgPonies
96ee35e5de
Added Mechanic karma job, builds and repairs spacepods, works under the CE
2014-05-19 06:49:35 -04:00
ZomgPonies
f2376198ff
Fix highlander clothing update maybe?
2014-05-19 06:14:55 -04:00
ZomgPonies
bfd6132f93
Makes morgue and genetics less of a puke stained shitholes. Closed bodybags and medical masks stop people from puking from bodies now.
2014-05-18 19:15:51 -04:00
ZomgPonies
d2c82c2111
Compile fix
2014-05-18 19:03:42 -04:00
Rob Nelson and ZomgPonies
61609ab2f9
Add superjuke, fix more bugs with joukbucks.
...
Conflicts:
code/modules/media/jukebox.dm
2014-05-18 18:47:30 -04:00
Rob Nelson and ZomgPonies
f1e09dd3e1
More juke bugs
2014-05-18 18:43:55 -04:00
Rob Nelson and ZomgPonies
48978767c8
Jukebox casters should work now. (Tested)
2014-05-18 18:43:44 -04:00
alex-gh
01b41acf06
Removed game-breaking virology effect
2014-05-18 17:59:58 +02:00
alex-gh
8f600162ef
Virology symptom fixes.
...
Cleaned up and reordered symptoms.
Removed unneeded whitespace.
Made some of the symptoms less cruel.
Fixed non-working symptoms because of missing multiplier
2014-05-18 13:42:38 +02:00
ZomgPonies
73f12189b7
First step in regrouping all non-spell abilities under the same tab to facilitate UI navigation.
2014-05-18 00:58:25 -04:00
Rob Nelson and ZomgPonies
6a0cc4a43b
Fix buggy robot MMI removal.
2014-05-17 22:05:45 -04:00
Rob Nelson and ZomgPonies
b66d0b002f
Jukebox supports being moved.
2014-05-17 22:04:50 -04:00
Zuhayr and ZomgPonies
0505b4f5f8
Cleaned up holders a bit, added show_message() proc to them, added loops in custom_emote to show emotes to things in inventories with the right flag.
...
Conflicts:
baystation12.dme
code/modules/mob/emote.dm
2014-05-17 22:00:39 -04:00
Zuhayr and ZomgPonies
63f3e5ccd9
Adds PASSEMOTES flag to setup.dm, dionaea and borers.
...
Conflicts:
code/modules/mob/living/carbon/monkey/diona.dm
code/modules/mob/living/simple_animal/borer.dm
2014-05-17 21:57:10 -04:00
Ccomp5950 and ZomgPonies
8a17208a2b
Humanoid mobs won't default to having an undershirt.
2014-05-17 21:20:51 -04:00
Rob Nelson and ZomgPonies
8e7f15003b
Add circuit printer design for Space Pod mainboard.
2014-05-17 19:18:17 -04:00
cloroxygen and ZomgPonies
c8b1fd08de
21 viro symptoms
...
Im an idiot that cant use github edition
Conflicts:
code/game/objects/effects/decals/Cleanable/humans.dm
code/modules/virus2/effect.dm
2014-05-17 19:17:35 -04:00
Zuhayr and ZomgPonies
bfdf7cc217
Derp.
2014-05-17 01:38:14 -04:00
jack-fractal and ZomgPonies
fd4cd0007c
fixing the player panel to work with spirits and masks
...
Conflicts:
code/modules/admin/player_panel.dm
code/modules/mob/mob_helpers.dm
2014-05-17 01:22:13 -04:00
jack-fractal and ZomgPonies
b9be0b6ded
removing debugging junk from the spirit topics follow commands
2014-05-17 01:17:04 -04:00
Zuhayr and ZomgPonies
03a6213ee9
Added leap and gut verbs to vox.
2014-05-17 01:16:28 -04:00
Zuhayr and ZomgPonies
893b1c633f
Added computer boards and gas tanks to the drone gripper (oversight).
2014-05-17 01:16:19 -04:00
Zuhayr and ZomgPonies
3afc5a5cc5
Commented out some debug lines.
2014-05-17 01:16:09 -04:00
Zuhayr and ZomgPonies
27356b09e4
Removed vox snowflake crap from human breathing, expanded it out so that species datums will inform breathable gas, toxic gas and exhaled gas types.
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2014-05-16 00:27:36 -04:00
Zuhayr and ZomgPonies
c5966cdec9
Added a caching system for human icons.
...
Conflicts:
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/carbon/species.dm
2014-05-16 00:15:59 -04:00
Zuhayr and ZomgPonies
7316657443
Fixes another drone runtime, fff.
2014-05-15 22:25:13 -04:00
Zuhayr and ZomgPonies
de51d4e5b7
Fixing a bug with leap() and gut()
2014-05-15 22:25:01 -04:00
ZomgPonies
9981259b0b
I iz stoopid, Ccomp iz smrt
2014-05-15 20:30:25 -04:00
ZomgPonies
a78886ea44
Vox medical mask
2014-05-15 20:09:42 -04:00
Rob Nelson and ZomgPonies
1615a17077
Add horribly-sprited Vox clown, mime, owl and gag masks.
...
Conflicts:
code/modules/clothing/masks/gasmask.dm
code/modules/mob/living/carbon/species.dm
2014-05-15 20:08:50 -04:00
jack-fractal and ZomgPonies
6c5a4bc6f5
fixing the gib code bug
2014-05-15 05:16:34 -04:00
jack-fractal and ZomgPonies
05da6ed973
adding modifications to cult mode, working spirits, and mask transformation procs
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/modules/mob/mob.dm
code/modules/mob/mob_movement.dm
2014-05-15 05:16:13 -04:00
jack-fractal and ZomgPonies
2754b56e0c
adding the spirit entity code, fixing the cameraNet so that it compiles properly
...
Conflicts:
code/datums/visibility_networks/dictionary.dm
code/game/machinery/doors/door.dm
code/modules/mob/living/silicon/ai/freelook/cameranet.dm
2014-05-15 05:06:38 -04:00
jack-fractal and ZomgPonies
3df35fe03c
modifying visibility interface of ai to use generic visibility_interface
...
Conflicts:
baystation12.dme
code/game/gamemodes/malfunction/Malf_Modules.dm
code/modules/mob/living/silicon/ai/freelook/cameranet.dm
code/modules/mob/living/silicon/ai/freelook/chunk.dm
code/modules/mob/living/silicon/ai/freelook/eye.dm
code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
2014-05-15 04:43:49 -04:00
ZomgPonies
a2b05d96f5
Mutiny fixes
2014-05-15 03:16:48 -04:00
ZomgPonies
a545590f68
Fix armalis breathmask
2014-05-15 02:09:39 -04:00
ZomgPonies
28406d3bf2
Vox breath fixes
2014-05-15 02:03:37 -04:00
Jeremy Liberman and ZomgPonies
bd249e3a53
Mutiny Mode
...
Conflicts:
code/__HELPERS/time.dm
code/controllers/hooks-defs.dm
code/controllers/hooks.dm
code/game/machinery/computer/card.dm
code/game/machinery/podmen.dm
code/modules/admin/player_panel.dm
code/modules/client/preferences.dm
code/modules/mob/living/carbon/brain/brain_item.dm
code/modules/mob/living/carbon/human/death.dm
code/modules/mob/living/login.dm
code/modules/mob/mob.dm
code/modules/security levels/keycard authentication.dm
code/setup.dm
icons/mob/mob.dmi
2014-05-15 01:01:54 -04:00
ZomgPonies
5ffb4a15ed
Moar armalis fixes
2014-05-14 23:00:13 -04:00
ZomgPonies
66d9ba3fb8
Fixing up vox and vox armalis gear
2014-05-14 22:24:34 -04:00
Rob Nelson and ZomgPonies
188593e452
SECURITY FIX: Custom borg names sanitized and copytext'd to MAX_NAME_LEN
2014-05-14 20:12:48 -04:00
Zuhayr and ZomgPonies
43e60ab01e
Armalis gear and mob icons, plus sonic cannon.
...
Added sonic cannon skeleton code.
Noise cannon fire sound, Vox shriek sound.
Added Vox Armalis species.
Swapped vox breath mask over to species_restricted check.
Added Vox Armalis gear.
Added a random shriek effect to Vox and Vox Armalis speech.
Added quickspawn Vox Armalis definition.
Vox shriek sound effect. Thought I committed this earlier.
Added r_hand and l_hand icon_overwrite checks.
More work on Armalis. Added gut() and leap() human procs.
Adding/fixing up the leap() and gut() verbs, and a LEAPING status_flag for human/Bump().
Fixing some missing pixels in the armalis tail.
Almost forgot to whitelist armalis...
Conflicts:
code/modules/clothing/spacesuits/alien.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/carbon/human/update_icons.dm
icons/mob/suit.dmi
icons/obj/clothing/gloves.dmi
icons/obj/clothing/masks.dmi
icons/obj/clothing/shoes.dmi
icons/obj/gun.dmi
2014-05-14 18:24:01 -04:00
ZomgPonies
97765314ba
Adds a language to Kidan as requested
2014-05-14 04:54:13 -04:00
Zuhayr and ZomgPonies
5ce82b0c71
Fixes #4810
...
Conflicts:
code/modules/mob/living/carbon/monkey/life.dm
2014-05-14 04:40:54 -04:00
Rob Nelson and ZomgPonies
9d53cfa446
Moved Vox DMI to a subfolder, added species-based random-naming, fixed preview.
...
Tested.
Conflicts:
code/game/gamemodes/vampire/vampire_powers.dm
code/game/gamemodes/vox/heist/heist.dm
code/modules/admin/verbs/one_click_antag.dm
code/modules/events/heist.dm
code/modules/mob/living/carbon/species.dm
code/modules/mob/mob.dm
code/modules/mob/new_player/new_player.dm
code/modules/mob/new_player/preferences_setup.dm
2014-05-14 04:32:18 -04:00
ZomgPonies
582f3c4edc
Fix being unable to respawn as mouse
2014-05-14 02:56:10 -04:00
ZomgPonies
e8ae55cead
Wow, I must've been tired on that one. Fixes respawn as NPC.
2014-05-14 02:50:51 -04:00
Zuhayr and ZomgPonies
f9fd80d639
Attempting to fix a bug involving resource stacks failing to appear when used.
...
Conflicts:
code/modules/mob/living/silicon/robot/robot_modules.dm
2014-05-14 01:10:59 -04:00
alex-gh