Commit Graph

12603 Commits

Author SHA1 Message Date
Zuhayr bfdf7cc217 Derp. 2014-05-17 01:38:14 -04:00
jack-fractal 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 b9be0b6ded removing debugging junk from the spirit topics follow commands 2014-05-17 01:17:04 -04:00
Zuhayr 03a6213ee9 Added leap and gut verbs to vox. 2014-05-17 01:16:28 -04:00
Zuhayr 893b1c633f Added computer boards and gas tanks to the drone gripper (oversight). 2014-05-17 01:16:19 -04:00
Zuhayr 3afc5a5cc5 Commented out some debug lines. 2014-05-17 01:16:09 -04:00
Zuhayr 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 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 7316657443 Fixes another drone runtime, fff. 2014-05-15 22:25:13 -04:00
Zuhayr 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
Rob Nelson dab59fd88a Compilefix 2014-05-15 20:16:51 -04:00
Rob Nelson 36729d3c8d New 2554 Durand Mk II has arrived.
Signed-off-by: Rob Nelson <nexisentertainment@gmail.com>

Conflicts:
	html/changelog.html
	icons/mecha/mech_construct.dmi
	icons/mecha/mech_construction.dmi
	icons/mecha/mecha.dmi
2014-05-15 20:16:41 -04:00
Rob Nelson a2cfa562b3 Fix UI syringes not setting UI flag correctly. 2014-05-15 20:10:47 -04:00
ZomgPonies a78886ea44 Vox medical mask 2014-05-15 20:09:42 -04:00
Rob Nelson 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 6c5a4bc6f5 fixing the gib code bug 2014-05-15 05:16:34 -04:00
jack-fractal b1af8d1a6a fixing the traitor panel 'make cultist' function 2014-05-15 05:16:22 -04:00
jack-fractal 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 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 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
jack-fractal 466070e10f adding the visibility network datums 2014-05-15 04:16:37 -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
ZomgPonies 8aa4d10b75 Trying to fix mutiny mode? 2014-05-15 01:52:27 -04:00
Jeremy Liberman 0c01c6e4df Prevent request forgery exploit in card.dm 2014-05-15 01:02:18 -04:00
Jeremy Liberman 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 188593e452 SECURITY FIX: Custom borg names sanitized and copytext'd to MAX_NAME_LEN 2014-05-14 20:12:48 -04:00
Zuhayr 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 5ce82b0c71 Fixes #4810
Conflicts:
	code/modules/mob/living/carbon/monkey/life.dm
2014-05-14 04:40:54 -04:00
Rob Nelson 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
Rob Nelson 058658f930 Add pod sprites and goonsmoke sprites for Pomf. 2014-05-14 01:27:56 -04:00
Zuhayr 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
Erthilo 1685262f31 Allows clothing to appear differently on different species. Needs sprites though.
Conflicts:
	code/game/objects/items.dm
	code/modules/clothing/under/color.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/species.dm
2014-05-13 22:47:26 -04:00
ZomgPonies 8237b9cfea Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-05-13 21:57:59 -04:00
Erthilo 288385ba66 Adds vox fitted uniforms and shoes to all jobs excluding sec, mime, and clown.
Conflicts:
	code/modules/clothing/under/color.dm
	code/modules/clothing/under/jobs/civilian.dm
	code/modules/mob/living/carbon/species.dm
	icons/mob/species/vox_w_uniform.dmi
2014-05-13 21:57:50 -04:00
alex-gh 640f925ef0 Merge pull request #201 from alex-gh/event_fixes
Event fixes
2014-05-13 18:17:03 +02:00
alex-gh 4a7e113cf5 Pyro anomaly tweaks
Pyro anomaly arrives much later after announcement, making it easier to disable.
Pyro anomaly now produces more plasma.
2014-05-13 17:20:28 +02:00
alex-gh df71e810de Bluespace anomalies should no longer move disposal outlets 2014-05-13 17:17:30 +02:00
ikarrus 139f6bd099 Medbots no longer waste chemicals
Medbots will no longer expend the entire contents of their internal beaker on one patient.
2014-05-13 00:27:38 -04:00
Ccomp5950 8097d25b26 Bugfix: Brand new players will have a client.player_age of 0
Before:  When a client is created it's player_age variable is set to "Requires Database", then a select query is ran against the database to see if they have been seen before if they have logged in before this will have a row for them and it will set player age.  However if there is no row for them it doesn't change player_age from default.

After:   Before we check for an entry in the database we set their player_age to zero, we already checked we have a database connection so we know we will be able to pull this information and if we can't then it means they are a new player.  Set their player_age to zero and be done with it.

What this does:  Brand new players will no longer be able to bypass the jobs minimal age limit.
2014-05-13 00:15:11 -04:00
Ccomp5950 7c97361d86 Jobs you can't select are struckthrough instead of just being red.
Before:  It's going to be kinda confusing when a new player goes to setup their jobs and they see this: http://i.imgur.com/miK9Isk.png
Specifically "unavailable occupations are in red" and then a list of days till they can play that role but also RED [NEVER] which to a new player migth cause confusion thinking
they can never play that role.

After:  Remove the red and add a strikethrough ( http://i.imgur.com/BQ90xr6.png  ) to show "these jobs are unavailable" while making the other jobs look, well more available.

Conflicts:
	code/modules/client/preferences.dm
2014-05-13 00:14:00 -04:00
Zuhayr 0ccda98e3f Added a *chirp sound for diona nymphs. 2014-05-13 00:09:45 -04:00
ZomgPonies cfaa0a2c1d Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-05-13 00:09:31 -04:00