cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 08:31:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,478 Commits 26 Branches 2 Tags
97765314ba467cc609194c63d4e50072dcbf45bb
Commit Graph

7187 Commits

Author SHA1 Message Date
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
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
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
Zuhayr
31d661f1cd Adds inter-drone speak at close range (say) 2014-05-13 00:08:50 -04:00
Zuhayr
e87f4afbf2 Fixes no cooldown on shutdown drones, adds wood tiles and rglass to drone module, changes how regenerating resources work slightly. 
Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
 2014-05-13 00:08:29 -04:00
Necaladun
3d7fd0f83e Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-05-13 03:52:57 +09:30
Necaladun
38b92bde0e Vox jumpsuits 
Ripped vox jumpsuits for pancakeflipper
 2014-05-13 03:34:46 +09:30
alex-gh
ca9d735b23 Map fixes - mostly disposals 2014-05-12 15:51:12 +02:00
Ccomp5950
1944048870 Canceling an IRC-adminPM will not send a blank message. 
Ooops
 2014-05-12 04:49:03 -04:00
Ccomp5950
327af807c1 You can now request player notes through IRC bots. 
Conflicts:
	code/world.dm
 2014-05-12 04:48:32 -04:00
Ccomp5950
ef9c8875d3 IRC-AdminPM is limited to 400 characters. 2014-05-12 04:45:38 -04:00
Ccomp5950
15c889f186 Code for new bots allowing admins to PM Players via IRC and vice versa. 
Conflicts:
	code/modules/ext_scripts/irc.dm
 2014-05-12 04:45:13 -04:00
Zuhayr
b6f3649264 Allowed drones to decompile dead but not gibbed clientless drones. 2014-05-12 04:41:38 -04:00
Zuhayr
16b97cd58f Simplified robot repairs a lot for drones. No more organ damage for them. 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
 2014-05-12 04:41:17 -04:00
Zuhayr
69e4fa1801 Added a cooldown to CLONG CLONG from moving in disposals. 2014-05-12 04:38:29 -04:00
Zuhayr
e1bfc3cfe0 Allowed magnetic grippers to remove APC cells. 
Conflicts:
	code/modules/power/apc.dm
 2014-05-12 04:38:08 -04:00
Zuhayr
8c3ea8dac6 Made drone control consoles buildable/researchable. 2014-05-12 04:36:19 -04:00
Zuhayr
0eb68ed3aa Fixes #4744 2014-05-12 03:10:59 -04:00
Zuhayr
dbdc032e49 Fixes lack of update on drone fabricator console. 2014-05-12 03:09:34 -04:00
Zuhayr
659f722b1d Fixes drone regeneration of materials issue. 2014-05-12 03:08:43 -04:00
Zuhayr
084004049a Fixes 'resource depleted' error for emagged drones. 2014-05-12 03:08:32 -04:00
Zuhayr
50873adbf8 Fixes the decompiler. Adds spiderlings, broken globes, mice and lizards as valid targets. 
Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone_items.dm
 2014-05-12 03:08:12 -04:00
Zuhayr
2e545095f7 Readds drone held icon that got lost somewhere in merges. 
Conflicts:
	icons/obj/objects.dmi
 2014-05-12 03:05:41 -04:00
Zuhayr
8914cdb2ba Double whoops. 2014-05-12 03:03:48 -04:00
Zuhayr
450beac5a9 Fixes a runtime with drones building lights. 2014-05-12 03:03:37 -04:00
Zuhayr
57e2ff481f Whoops. 2014-05-12 03:03:25 -04:00
Zuhayr
8f9841d349 Removed a redundant line. 2014-05-12 03:03:15 -04:00
Zuhayr
097f903ba3 Added toggle verb for drones. 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2014-05-12 03:03:01 -04:00
Zuhayr
b70337918c Join As Drone and drone rebooting will now check cyborg jobbans. 2014-05-12 03:00:52 -04:00
Zuhayr
1af09fbfba Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable. 
Conflicts:
	baystation12.dme
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/modules/projectiles/guns/projectile/bow.dm
	icons/obj/gun.dmi
 2014-05-12 02:59:53 -04:00
ZomgPonies
7c843665a0 Compile fix 2014-05-12 02:52:56 -04:00
Ccomp5950
fd23f7f7ba Re-adds Show Player Panel right click menu on players. 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2014-05-12 02:19:51 -04:00
Zuhayr
d606d774d8 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing. 
Conflicts:
	baystation12.dme
	code/controllers/configuration.dm
	code/game/objects/items/weapons/AI_modules.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/examine.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/recycling/disposal.dm
	icons/mob/robots.dmi
	icons/obj/device.dmi
 2014-05-12 01:41:02 -04:00
ZomgPonies
c6d481f00a Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-05-12 01:11:48 -04:00
ZomgPonies
81d29c4409 Merge pull request #196 from Regen1/master 
Rebalanced some rigs + SM typo fix
 2014-05-12 01:10:19 -04:00
SamCroswell
c4d7c91e76 Map Bugfixes, some past due Ninja changes 2014-05-10 22:25:58 -04:00
Regen
6dc8e2a497 Forgot latest sec rig changes 2014-05-10 18:18:54 +02:00