cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 05:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,205 Commits 26 Branches 2 Tags
0221e5bdff67831bef00adfa0909c96e079f2cb1
Commit Graph

7030 Commits

Author SHA1 Message Date
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
Necaladun
0288be9081 Jukebox 
Adding missing , because i need more coffee
 2014-04-16 18:27:44 +09:30
Necaladun
fdabde9f84 Jukebox additions 
Removed empty jazz playlist, added papers please and aussie music
 2014-04-16 17:26:52 +09:30
Necaladun
d3757b9413 Hyperzine bottle 
A pre-spawned bottle of hyperzine
 2014-04-16 09:49:20 +09:30
Necaladun
f7246e3a40 Swap NT Rep and Customs Officer costs 
30 for NT Rep, 15 for Customs Officer to represent their importance.
 2014-04-15 00:37:27 +09:30
Necaladun
3e3fc0f314 Wisewill Sprites 
Added wisewills sprites - bane stuff, sec rig fixes
 2014-04-15 00:29:51 +09:30
Necaladun
dc417a522d Stun Revolver Upgrade 
Stun Revolver update - makes it do slightly less pain, but a little bit
of stun and weaken to give it some actual purpose
 2014-04-15 00:28:38 +09:30
alex-gh
369c894173 Fixed crash when hacking vending machines on clown planet 2014-04-09 01:33:43 +02:00
alex-gh
cfbfa0e993 Smoke rework caused endless loops, reverted. 2014-04-08 01:47:56 +02:00
alex-gh
521ad31671 Revert the new lighting system. 2014-04-07 23:51:35 +02:00
alex-gh
fe0411ac1b Merge branch 'genetics_instability' into ServerCode 2014-04-05 17:41:37 +02:00
RavingManiac
9bea0a097a trans_to_ingest now used for consumption of food, drink and pills instead of trans_to. This adds a ten second delay between ingestion and addition of the reagents to the body. 
Conflicts:
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/reagent_containers/food/cans.dm
	code/modules/reagents/reagent_containers/food/condiment.dm
 2014-04-05 17:39:14 +02:00
Jeremy Liberman
c74ff2d653 Fixes biogenerator typo, improper beaker splashing, and allows glass beakers to refill botany trays 
Conflicts:
	code/modules/reagents/reagent_containers/glass.dm
 2014-04-03 21:42:33 +02:00
Ccomp5950
ed69c23e07 Bugfix for new APC code, gridchecks won't just turn off equipment. 
Was a problem with me switching the order of the checks.

Conflicts:
	code/modules/power/apc.dm
 2014-04-03 21:37:43 +02:00
Loganbacca
e915af4fe5 Runtime fix 
- Fixed a runtime caused by effects bumping disposal chutes.

Conflicts:
	code/modules/recycling/sortingmachinery.dm
 2014-04-03 18:21:46 +02:00
Loganbacca
99751c0416 Reagent reaction_mob/turf tweaks 
- Adds an if() check to reaction_mob for catching a very rare runtime related to mobs inhaling smoke reagents from just deleted smoke.
- Carbons reaction_turf proc now modifies a single dirt overlay layer, instead of just adding more decal objects to the turf.
- Added some checks to the radium and uranium reaction_turf proc so it doesn't stack multiple greenglow decals.
- Performed colon removal surgery on thermites reaction_turf proc, also tweaked it's overlay operation to correctly overlay a chemical puddle effect, instead of a melted wall effect.
- Removed space_cleaners overlays.Cut() code, since it was removing decals from turfs.

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
 2014-04-03 18:21:45 +02:00
Loganbacca
0fba806c7b Chemsmoke rewrite 
- Complete rewrite of the chemsmoke spawning code (everything that happens after the reaction to create the smoke).
- Moved it into it's own file since it's a little longer than the old one code-wise.
- Tweaked the smoke sprites; gave chemsmoke directions for more randomization, and tweaked the timing of their animations so they are smooth now.

Most of the code is documented, so you should be able to follow what's going on just reading through it. In short though:
- Chemsmoke now affects a circular area with a variable range depending on the total amount of chemsmoke created (no more 1-of-each-ingredient smoke grenades - sorry).
- The carried reagent volume in the cloud balances itself according to how big the affected area is (larger area, less carried reagent per turf).
- The carried reagent has more volume the closer you are to the centre of the cloud.
- The visual smoke effect scales with how big the affected area is.

Conflicts:
	code/game/objects/effects/effect_system.dm
	icons/effects/96x96.dmi
 2014-04-03 18:21:26 +02:00
Chinsky
7f4388c5a3 Cleaned the fuck out of smoke. 
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/objects/effects/effect_system.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/organs/organ_external.dm
 2014-04-03 18:18:04 +02:00
alex-gh
2de66f51c8 Rebalanced power stacking. 
Active powers will now slowly give you clone damage. This should discourage power stacking.
 2014-03-30 15:56:12 +02:00
ZomgPonies
01b7f673c2 Merge pull request #175 from alex-gh/fixes_and_cherrypicks 
Fixes, cherrypicks and improvements
 2014-03-24 08:31:51 -04:00
d3athrow
749d4435e5 Fix them faggot bats again 
Conflicts:
	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2014-03-24 07:51:04 -04:00
d3athrow
d5e4fd0f33 Muh pod equipment 
Conflicts:
	code/modules/projectiles/projectile/beams.dm
 2014-03-24 07:49:37 -04:00
alex-gh
2b5dbab3b2 Blob spore infection is now curable, added indication for blob infection 2014-03-24 12:08:20 +01:00