cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-04-29 11:31:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 11 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

9304 Commits

Author SHA1 Message Date
ZomgPonies
e1ce0ee664 Errr 2014-05-24 09:15:26 -04:00
ZomgPonies
b4f5df6d1d Made flags unable to fit in backpacks. 2014-05-24 09:11:27 -04:00
ZomgPonies
769214e535 Refactored flags, added in excellent Clown Planet flag by Wubbledaddy 2014-05-24 07:48:29 -04:00
Mloc-Argent
1b2f83dee4 BS12 Hooks 2014-05-22 23:56:35 +02:00
alex-gh
3281c5f150 Merge pull request #213 from alex-gh/mutiny_fixes2 
Mutiny fixes? 3
 2014-05-21 16:33:06 +02:00
alex-gh
d14d253414 Mutiny fixes? 3 
Attempt to fix mutiny by replacing .Add() and .Remove() with += and -=
 2014-05-21 16:30:49 +02:00
UristMcKerman
8c24a36298 Canister will close valve when tank ejected 
I wonder why nobody did it before.

Conflicts:
	code/game/machinery/atmoalter/canister.dm
 2014-05-20 23:37:30 -04:00
ZomgPonies
408379ab6a vg economy overhaul 2014-05-20 22:51:02 -04:00
ikarrus
b385ed83b5 -Added checks to prevent the nuke disk from leaving z1 
-If the disk is deleted while it's inside a nuke, the nuke will lock itself

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/turfs/space/space.dm
 2014-05-20 21:32:37 -04:00
ikarrus
c139fa22a1 Objects being pulled will transition with mobs changing Z-levels via space 2014-05-20 21:25:01 -04:00
ZomgPonies
69725d9466 Revert "Refactored, simplified access system a bit. Tested, for once." 
This reverts commit a5e65d9b2b.
 2014-05-20 20:58:23 -04:00
ZomgPonies
f0ebf536c9 Renamed Atmos Tech to life support specialist due to new grav gen responsabilities 2014-05-20 16:12:36 -04:00
Rob Nelson
369b99530a Refactored, simplified access system a bit. Tested, for once. 
* Mobs provide GetAccess() and hasFullAccess()
 * Human GetAccess() provides the "best" accesses available combined from all conventional sources.\
 * Silicons have hasFullAccess()
 * AdminGhosts also provide full access.

Conflicts:
	code/game/jobs/access.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/mob.dm
	html/changelog.html
 2014-05-20 15:51:22 -04:00
alex-gh
ac20f7ace3 Merge pull request #208 from alex-gh/mutiny_fixes2 
Re-added mutiny fixes
 2014-05-20 13:09:08 +02:00
ZomgPonies
9e89c8cdcb Mutiny fixes 
Conflicts:
	code/game/gamemodes/mutiny/mutiny.dm
	code/game/objects/items.dm
 2014-05-20 13:06:59 +02:00
alex-gh
5066000778 Replayed mutiny fixes 2014-05-20 13:01:15 +02:00
UncleSporky
75114a326a Adds the Guy Fawkes mask to Autodrobe and spawn 
Conflicts:
	code/game/machinery/vending.dm
	code/game/objects/effects/landmarks.dm
	code/modules/clothing/masks/miscellaneous.dm
	icons/mob/mask.dmi
	icons/obj/clothing/masks.dmi
 2014-05-20 06:39:19 -04:00
ZomgPonies
1a33066817 Quickfix 2014-05-20 02:16:27 -04:00
ZomgPonies
27b9da70a7 Changing mechanics bay to new system 2014-05-20 01:58:24 -04:00
ESwordTheCat
a6ee8dc678 Revert gun pool for now. 
Conflicts:
	code/game/machinery/turrets.dm
	code/modules/projectiles/projectile/beams.dm
 2014-05-19 19:34:20 -04:00
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
ca09a0f5d5 Fix machine frames 2014-05-19 06:07:13 -04:00
ZomgPonies
31e88a71f7 Made nukeops pinpointer fit in PDA slot 2014-05-19 05:31:01 -04:00
ZomgPonies
838d746d6e Added an NT flag as decoration and added it to a bunch of places. ALL GLORY TO NANOTRASEN! 2014-05-19 04:36:59 -04:00
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