cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 11:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,245 Commits 26 Branches 2 Tags
02aab3f779c25c71d87cfbb68b0dfd10eee90c20
Commit Graph

7052 Commits

Author SHA1 Message Date
alex-gh
02aab3f779 Temporary revert for the new say code. 2014-04-24 10:28:52 +02:00
alex-gh
780ab3a32b Added a random delay to mass hallucination announcement, made hallucinations more severe 2014-04-23 18:30:19 +02:00
alex-gh
a1e4591c5a Moved more destructive events later in the round 2014-04-23 18:26:45 +02:00
d3athrow
528ffcef1d Fixes a nano runtime when the oldMob is null during a user_transfer 
Conflicts:
	code/modules/nano/nanomanager.dm
 2014-04-23 11:48:14 -04:00
d3athrow
bd0354cf7d Fix not being able to open the playerpanel of aliens due to a runtime. 2014-04-23 11:45:07 -04:00
ZomgPonies
1cdbe818ad tg's solars update 2014-04-22 09:46:36 -04:00
ZomgPonies
1a4ab5c799 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-04-20 10:10:22 -04:00
Ccomp5950
2d34d142a7 Say code fixes. 
Lobby players won't hear stuffs
Universal hearing with animals won't be a thing.
Players won't hear stuff if they are sleeping, though somethings might slip through...

Conflicts:
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/modules/mob/new_player/new_player.dm
 2014-04-20 09:30:18 -04:00
alex-gh
71151c0c57 Merge pull request #183 from alex-gh/event_area_rework 
Events can now strike all areas instead of few select ones
 2014-04-20 14:07:27 +02:00
alex-gh
8a9130026a Events can now strike all areas instead of few select ones 2014-04-20 14:04:15 +02:00
Mike
bf98751d8b Clean up check for item being equipped 
Moved some common code to item.dm. Someone should probably take a look
at get_equipped_items() in inventory.dm sometime in the future.
 2014-04-20 03:50:23 -04:00
Mike
6d8d253ad7 Prevent vox boots from enabling in player's hand 
Vox players can't "dig their claws into the flooring" when holding the
boots in their hand. When enabled, the boots can't be taken off until
disabled.
 2014-04-20 03:50:11 -04:00
Mike
9dbf6be429 Removed the now-redundant verb 
Less clutter for the object panel.

Conflicts:
	code/modules/clothing/shoes/magboots.dm
 2014-04-20 03:49:55 -04:00
Mike
79d530def8 Enabled action icon for magboots 
Conflicts:
	code/modules/clothing/shoes/magboots.dm
 2014-04-20 03:48:01 -04:00
ESwordTheCat
16d5d18e7c Revert from area to text. 
Conflicts:
	code/modules/power/power.dm
 2014-04-20 03:37:00 -04:00
ESwordTheCat
84c296e741 Use the experimental getArea. 
Conflicts:
	code/modules/power/power.dm
 2014-04-20 03:28:46 -04:00
ESwordTheCat
b332bc7dec Don't use get_area proc, introduce myArea variable. 
Conflicts:
	code/modules/power/power.dm
 2014-04-20 03:26:59 -04:00
ZomgPonies
f9a773c84d Fix smoke 2014-04-20 02:34:40 -04:00
ZomgPonies
4b1619ddf5 Fix for binary speak? 2014-04-19 22:14:08 -04:00
Rob Nelson
56d8ce28c8 Part 1 of economy rework: Spacecash refactor - See commit for full changelog. 
* Implements stacking and stack overlays
 * Simplified tiers of cash (1,10,100,500,1000, may remove 500)
 * Simplified API (dispense_cash, count_cash)

Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/admin/verbs/debug.dm
	code/modules/economy/ATM.dm
 2014-04-19 20:47:41 -04:00
Rob Nelson
b34d436756 Fix jukebox formatting 2014-04-19 20:37:01 -04:00
ESwordTheCat
cb2ecbaa30 Reduce use of named arguments. 2014-04-19 20:36:47 -04:00
Rob Nelson
0221e5bdff Fix jukebox after hammering it :V 2014-04-19 20:33:35 -04:00
Rob Nelson
2389e9a778 Fix a bunch of jukebox issues, clean up UI a bit, add feedback, allow slapping it to reset if broken. 2014-04-19 20:33:22 -04:00
Duny
235d32999a Fix borgs not choosing an appareance 
Locks down cyborgs after they choose a module until they choose an
appareance, to prevent standard borgs with security modules and such
running around.

Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
 2014-04-19 20:32:58 -04:00
Rob Nelson
6d7040e735 A few remaining jukebox bugs 
Conflicts:
	code/modules/media/mediamanager.dm
 2014-04-19 20:21:44 -04:00
Rob Nelson
ac5fcf31a5 Autoplay after power restoration when emagged. 2014-04-19 20:03:33 -04:00
Rob Nelson
cf4b9f5e42 Emaggable jukebox. 2014-04-19 20:02:42 -04:00
ESwordTheCat
c43652b33a Okay shards converted to pool usage now. 
Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/objects/structures/displaycase.dm
	code/modules/mining/mine_turfs.dm
	code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
 2014-04-19 19:57:53 -04:00
ESwordTheCat
75b6f2a2dd return pool for plasma shards. 2014-04-19 19:42:29 -04:00
Rob Nelson
9227481a8a Standardize windows. 
Conflicts:
	code/WorkInProgress/buildmode.dm
	code/game/machinery/doors/airlock.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/twohanded.dm
	code/game/objects/structures/window.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
 2014-04-19 19:36:33 -04:00
VelardAmakar
dc6f794368 Adds the ability to construct, destroy, and take apart bookcases. 
Bookcases can be built using 5 wood planks.
Bookcases can be destroyed using weapons(50HP).
Bookcases can be taken apart using a wrench.
 2014-04-19 19:13:33 -04:00
ESwordTheCat
a947775f2e Add missing lens. 
Conflicts:
	code/modules/mob/mob.dm
 2014-04-19 19:13:05 -04:00
d3athrow
dd1613f6c4 you can set the volume of the jukebox now, preferences tab -> set volume 
Conflicts:
	code/modules/media/mediamanager.dm
 2014-04-19 18:58:56 -04:00
fleure
0dcee05ab2 Watertank nozzles no longer delete 
Conflicts:
	code/game/objects/items/weapons/tanks/watertank.dm
	code/modules/mob/mob_helpers.dm
 2014-04-19 18:17:49 -04:00
Firecage
c948e01b85 Customizable clown mask with 2 new options 
Conflicts:
	code/modules/clothing/masks/gasmask.dm
	config/admins.txt
	icons/mob/mask.dmi
	icons/obj/clothing/masks.dmi
 2014-04-19 18:13:27 -04:00
Ccomp5950
e224a636b9 Some fixes saycode cleanups 
Moved the verb check from hear to the speaker

Spellcheck on hulk so Dragor doesn't beat me up.
 2014-04-19 17:06:23 -04:00
Ccomp5950
b28df8857d Saycode rewrite: Add support for speech_problem_flag 
Ready for Dev

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2014-04-19 17:06:05 -04:00
Ccomp5950
9965c5ff8d Removal of last debug message and making players be able to use languages over general comms 
;:k = skrell speak over general comms for example.
 2014-04-19 17:04:47 -04:00
Ccomp5950
66f3d8ab75 Say code rewrite, Silicon jerks now using new saycode. 
Tracking added for AI's and Observers

Instead of calling GetVoice() over and over for everyone that can hear you we're checking a variable that is updated with Life()

removed a bunch of my debug verbs.

Conflicts:
	code/game/machinery/telecomms/broadcaster.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/living/silicon/say.dm
 2014-04-19 17:04:29 -04:00
Ccomp5950
9dab2ad8a1 Saycode rewrite initial commit. 
Create structure for modular saycode

Regular chat:
specific_paths/say() -> living/say() -> specific_paths/hear_say()

Radio chat:
specific_paths/say() -> Telecoms shit -> specific_paths/hear_radio()

Humans done.

Todo:  AI, Robot, simple_animal, and ghosts.

Conflicts:
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/telecomunications.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/say.dm
 2014-04-19 16:54:16 -04:00
DJSnapshot
184162e8db disregard failure. I made a silly. 2014-04-19 16:44:45 -04:00
DJSnapshot
9ddc4aae92 initial CC paper commit. Will continue work on this. 
Conflicts:
	code/modules/paperwork/photocopier.dm
	icons/obj/bureaucracy.dmi
 2014-04-19 16:44:20 -04:00
Mike
f98a2af41f Fueltanks leak fuel when wrenched open 
Fueltanks now actually leak fuel when wrenched open. The leaking only occurs at the initial wrenching and when tank is moved.

Conflicts:
	code/modules/reagents/reagent_dispenser.dm
 2014-04-19 16:41:17 -04:00
Ccomp5950
14744895c5 Juggernauts will no longer be weakened and unable to click stuff if zas knocks them over. 2014-04-19 16:35:21 -04:00
DJSnapshot
e1af1f4713 replaced electrodes with insta hit taser beams. 
Conflicts:
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/projectile/beams.dm
	icons/obj/projectiles.dmi
 2014-04-19 16:28:23 -04:00
DJSnapshot
843ac65077 Undershirts and rolling down jumpsuits! 
Conflicts:
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	icons/mob/human.dmi
	icons/mob/uniform.dmi
 2014-04-19 16:17:14 -04:00
Jarcolr
60ede94929 Also fixes paperbin without hands 
Whee.
 2014-04-19 15:53:44 -04:00
Ccomp5950
90ff395199 Lagsie no more, NarSie HUNGERS 
removed del() calls for objects, now it sets loc to null and removes it from master_controller processing

Much quicker :)

Conflicts:
	code/modules/power/singularity/singularity.dm
 2014-04-19 15:48:48 -04:00
Jeremy Liberman
f43ef06431 Virology - NanoUI, gameplay tweaks, bugfixes 
Conflicts:
	.gitignore
	code/game/machinery/kitchen/smartfridge.dm
	code/game/machinery/machinery.dm
	code/modules/food/recipes_microwave.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/virus2/isolator.dm
	nano/js/nano_base_helpers.js
 2014-04-19 15:42:49 -04:00