cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-28 02:11:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,532 Commits 28 Branches 2 Tags
bfd6132f93ef59ea46edbd1f378f6a18d23a67a5
Commit Graph

6928 Commits

Author SHA1 Message Date
ZomgPonies
f929f83883 Finished mechanic workshop 2014-05-18 05:47:22 -04: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
b66d0b002f Jukebox supports being moved. 2014-05-17 22:04:50 -04:00
ZomgPonies
7973c1f158 fix machine frame cable coil bug 2014-05-17 20:12:24 -04:00
cloroxygen
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
Rob Nelson
e7d4c1db14 OH GOD YOU CAN BUILD PODS NOW OH GOD 
Conflicts:
	code/datums/helper_datums/construction_datum.dm
	code/game/machinery/constructable_frame.dm
	code/game/mecha/mech_fabricator.dm
	code/game/mecha/mecha_construction_paths.dm
	code/game/mecha/mecha_parts.dm
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm
 2014-05-17 19:05:08 -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
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
ZomgPonies
a2b05d96f5 Mutiny fixes 2014-05-15 03:16:48 -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
Rob Nelson
188593e452 SECURITY FIX: Custom borg names sanitized and copytext'd to MAX_NAME_LEN 2014-05-14 20:12:48 -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
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
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
ZomgPonies
a5b0732770 Merge pull request #199 from GhostAA12/master 
Fixes smartfridge and Slime extract storage; Adds medical storage to replace the medicine cabinet
 2014-05-12 23:25:23 -04:00
alex-gh
b6b5e0a9fc Changed drone laws to be more VG like 2014-05-13 02:44:31 +02:00
AlexanderSeto
f188097edd Removed commented out code from smartfridge 2014-05-12 14:55:27 -07:00
AlexanderSeto
4b10b251cb This adds the medical fridge object and places it in medbay. 2014-05-12 14:49:52 -07: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
8c3ea8dac6 Made drone control consoles buildable/researchable. 2014-05-12 04:36:19 -04:00
Zuhayr
c599199a8e Fixes #4911 2014-05-12 03:11:15 -04:00
Zuhayr
fbbb3b50ce Fixes #4923 2014-05-12 03:10:37 -04:00
Zuhayr
c46505f633 Stops drones from self-destructing or being locked down by the RD console. 2014-05-12 03:08:55 -04:00
Zuhayr
450beac5a9 Fixes a runtime with drones building lights. 2014-05-12 03:03:37 -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
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
SamCroswell
c4d7c91e76 Map Bugfixes, some past due Ninja changes 2014-05-10 22:25:58 -04:00
ZomgPonies
48f00ee263 Revert "Thermite Effectiveness Scaling with Volume" 
This reverts commit 9a66fd7edd.

Conflicts:
	code/game/turfs/simulated/walls.dm
 2014-05-07 19:54:01 -04:00
Ccomp5950
fafde6dd15 [Bugfix] Fixes partial prints. 
Playays will now no longer leave complete prints from touching an item once.

Instead they will leave a partial print, that has a high chance of leaving more and more with each touch.

You have a 1/100 chance of leaving a full set of prints on your first touch.

Fixes #4176
 2014-05-07 16:12:51 -04:00
Zuhayr
c44fa8d470 Fixes #4534 
Conflicts:
	code/game/machinery/adv_med.dm
 2014-05-05 23:01:14 -04:00
Zuhayr
61cc809c87 Fixes #4495. 
Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
 2014-05-05 22:50:38 -04:00
SamCroswell
666a953c6c Requested Map Changes 2014-05-05 19:57:16 -04:00
ZomgPonies
48aea00e33 Grav generator, not mapped in yet 2014-05-05 03:03:22 -04:00
Razharas
4b2deebec6 Making datum handling not suck balls too hard 
Yeah now it can roughly be called okish
 2014-05-04 22:56:38 -04:00
Razharas
8ee92a0f81 Removing debug shite 2014-05-04 22:56:01 -04:00
Razharas
95b6406adb Makes this shit actually work 
Yeah, also added crafting controller to debug controllers(who will need
to debug crafting, but whatever)

Conflicts:
	code/controllers/verbs.dm
 2014-05-04 22:55:42 -04:00
Razharas
3d762cd892 Readded the crafting to tables 
Well at least now i can brag about how you can do this with just few
lines

Conflicts:
	code/game/objects/structures/tables_racks.dm
 2014-05-04 22:54:08 -04:00
Razharas
281fbc7648 Made crafting entirely datum 
Now it can be useful
Maybe
Probably
I hope

Conflicts:
	code/_globalvars/lists/objects.dm
	code/game/atoms.dm
	code/game/objects/structures/tables_racks.dm
 2014-05-04 22:47:38 -04:00
ikarrus
0b6341746b Thermiting walls leave admin prints 2014-05-04 22:38:24 -04:00
ikarrus
ce6eff3173 Added a sound effect to igniting thermite so it's not a silent stealthy move. 2014-05-04 22:38:11 -04:00