cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 19:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,934 Commits 26 Branches 2 Tags
521e5e49ef3ae8596f21c7425e29b20b4831d056
Commit Graph

155 Commits

Author SHA1 Message Date
alex-gh
0eed06bcc9 Stunbeams should no longer destroy computers 2014-06-02 09:49:58 +02: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
ZomgPonies
679f0fe293 Merge pull request #194 from SamCroswell/master 
Nukeops Weapons Rework
 2014-05-04 15:43:03 -04:00
SamCroswell
2081699e54 Bullet damage tweaks 
Upped the L6's bullet damage due to how high the cost of it is. Subject
to change, as always.
 2014-05-04 11:01:39 -04:00
ESwordTheCat
532298c725 Tweak object pool system. 
Conflicts:
	code/game/objects/structures/grille.dm
	code/modules/projectiles/projectile/beams.dm
	code/modules/projectiles/projectile/bullets.dm
	code/modules/projectiles/projectile/special.dm
 2014-05-03 22:54:09 -04:00
ESwordTheCat
33c492ae4c Fixed all the runtimes. 2014-04-29 13:39:50 -04:00
ESwordTheCat
2382984c03 Some optimization at object pooling, tinkering at beams.dm and reverting useless code. 
Conflicts:
	code/modules/projectiles/projectile/beams.dm
 2014-04-29 13:39:20 -04:00
ESwordTheCat
774a4407da Moar object pool. 
Conflicts:
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
	code/modules/projectiles/projectile/bullets.dm
	code/modules/projectiles/projectile/special.dm
 2014-04-29 13:36:39 -04:00
ESwordTheCat
ebfcc9be79 Object pool for beam projectile, minor changes to object pool. 
Conflicts:
	code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm
	code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm
	code/game/objects/structures/grille.dm
	code/modules/power/singularity/emitter.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
 2014-04-29 13:33:06 -04:00
Mloc-Argent
fcdcef5931 human: move organ generation into a species proc 
New proc: /datum/species/create_organs
Called in set_species when no organs exist or it's forced.
Also shuffled set_species around a bit, adding a var to human/new to
specify a species to start as.
Should fix the adminspawn vox organ runtime.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/organs/organ.dm
 2014-04-28 21:09:45 -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
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
d3athrow
d5e4fd0f33 Muh pod equipment 
Conflicts:
	code/modules/projectiles/projectile/beams.dm
 2014-03-24 07:49:37 -04:00
Cheridan
b66abb1a6e adds the mime mech 
Conflicts:
	code/game/mecha/equipment/weapons/weapons.dm
	code/modules/projectiles/projectile/bullets.dm
	icons/mecha/mecha.dmi
	icons/mecha/mecha_equipment.dmi
 2014-03-05 22:43:36 -05:00
TZK13
0a83349284 Adds incendiary shotgun shells available via hacked autolathes in a new subclass of incendiary bullets and gave chemical dart shells their own sprites. 
Conflicts:
	code/game/machinery/autolathe.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/modules/projectiles/ammunition/bullets.dm
	code/modules/projectiles/projectile/bullets.dm
	icons/obj/ammo.dmi
 2014-03-02 01:27:07 -05:00
Incoming
6979765adb rerebalanced the SoC after running the odds 
Conflicts:
	code/modules/projectiles/projectile/magic.dm
 2014-02-16 05:47:17 -05:00
Incoming
d1cbeffbb1 Animate statues in magic stuff/Staff of Change rebalance 
Adds animate statues to the Staff of Change pool of mobs
Adds specific synergy between flesh to stone and the staff of animation where if you animate your statue'd people they'll turn to animated statues controlled by the victim who are instructed not to dunk the wizard.

Splits the "animal" sub pool in the Staff of Change into "Beast" and "Helpless Animals" to help raise the odds of the former against the latter. Changed odds will be reported in a comment to follow.
 2014-02-16 05:44:51 -05:00
Regen
2abd278744 Heavy laser buff and new sniper projectile 
Boosted the heavy laser to do 45 damage instead of 40, making it
slightly better than the standar laser.
Made the energy drain slightly less on mechs
Added a more slim projectile to the sniper rifle, the old fruit shot was
to fat
 2014-02-08 13:20:59 +01:00
SamCroswell
bd26d1b0b7 Various Pulse Rifle Fixes 2014-02-06 23:10:02 -05:00
Ergovisavi
f85ac1af63 Walking mushrooms will now hunt and eat eachother, growing stronger when they do! The stronger they get, the better the quality of the mushroom slices you can butcher out of them! Don't smack em yourself though, or you'll bruise them, and they won't get stronger from being eaten. 
Conflicts:
	baystation12.dme
	code/modules/mob/living/simple_animal/friendly/mushroom.dm
 2014-02-01 05:27:59 -05:00
ZomgPonies
959d3137da compile fix 2014-01-23 10:26:25 -05:00
Ergovisavi
89c23fc494 Kinetic gun can now break through mining tiles due to the goliath being able to possibly trap you in an unwinnable situation otherwise 
More mob behavior vars in hostile animal, added Passtable to hivelord and brood and removed their environment smash

Conflicts:
	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2014-01-23 10:22:07 -05:00
Ergovisavi
78bea65a44 Mining Mobs - More mob behavior overhaul, kinetic gun tweaks, etc 
Conflicts:
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/projectiles/ammunition/energy.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/special.dm
	icons/mob/animal.dmi
	icons/obj/projectiles.dmi
 2014-01-22 16:39:54 -05:00
Tenebrosity
67c88c42e7 Adds generic impact noises to all projectiles 
Overrides the generic sounds with specific ones for electrodes and
lasers.

Conflicts:
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/energy.dm
 2014-01-22 10:20:16 -05:00
ZomgPonies
90496be20a Standardized intent names so it's all harm. Fuck you hurt. 2014-01-19 08:30:50 -05:00
ZomgPonies
1caf56a29f Buff pulse rifles 2014-01-15 08:10:40 -05:00
Hornygranny
95835ac98c Changed neurotoxin from a child of energy to a child of bullet 
Conflicts:
	code/modules/projectiles/projectile/bullets.dm
 2014-01-13 04:36:15 -05:00
Hornygranny
5a443e5010 Replaced spaces with tabs. 2014-01-13 04:27:18 -05:00
Hornygranny
6eefff2c68 Code by Giacom. Changes alien neurotoxin spit to dumbfire. 
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
 2014-01-13 04:27:08 -05:00
ZomgPonies
9b6f9c07a6 Regens sniperlaser 2013-12-30 13:02:43 -05:00
ZomgPonies
a1656037e4 New guns and gun sprites 2013-12-28 10:46:48 -05:00
ZomgPonies
ecaaec5257 Magic Overhaul Part Deux 2013-12-18 02:30:55 -05:00
ZomgPonies
12b8ae8d76 Magic Overhaul 2013-12-14 05:54:03 -05:00
ZomgPonies
d4055a89af Buckshot whee! 2013-12-12 22:10:33 -05:00
ZomgPonies
f07b6616d3 Added a HONK rifle to the HONKsquad, shoots snap-pops 2013-11-16 02:27:20 -05:00
ZomgPonies
1368fb3bfb Projectile update 2013-11-01 14:00:50 -04:00
ZomgPonies
359d5dd541 Beamcode fix 2013-10-20 19:59:29 -04:00
ZomgPonies
3bd589289b Xray gun 2013-10-12 14:43:05 -04:00
ZomgPonies
853d490660 Various fixes. 2013-09-27 02:41:41 -04:00
ZomgPonies
b0aff645a3 Massive traitor item overhaul 2013-09-23 05:41:53 -04:00
Zuhayr
6f9b6e9704 Fixed language datum comparison, fixed staff of change runtime. 2013-08-06 07:33:07 -07:00
Zuhayr
98bbb095ad Swapped languages and datums over to global lists. Updated verbs. 2013-08-05 20:34:38 -07:00
Zuhayr
b875ff021b Vast array of changes to replace mutantrace with species datum 2013-08-03 15:08:54 -07:00
Mloc-Argent
cf53dd7a10 Revert "Adds in the Kida" 
This reverts commit a2fddc0fc1.
 2013-07-12 12:22:35 +01:00
NicholasDV
a2fddc0fc1 Adds in the Kida 
Adds in the Kida Race to all parts.
 2013-06-13 18:22:05 -04:00
Zuhayr
98d31e9191 Preliminary work for pneumatic cannons (WIP, no sprites, broken gun) 2013-06-10 22:35:01 -07:00
Zuhayr
8b518f5639 Sprites and equipment for a psychic villain wizard variant. Mental focus is fairly experimental. 2013-06-08 19:20:02 -07:00
MisterBook
a34174e124 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-05 18:39:43 -05:00
Zuhayr
06f04e6374 Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite. 2013-06-05 17:35:38 +09:30
MisterBook
fd8d61aa8b New taser fix is now in place. Rather than full deflection, armor mitigates the damage. Updates along all sorts of Clothing for minor mitigations to major mitigations. 
New define - AGONY. Used as an effect (Like STUN, WEAKN, etc) to cause HALLOSS. Allows use of HALLOSS projectiles without having to worry about them shattering windows/grilles. Future use? Torture tools, pain inducers for interrogation, 'Be Good' modules, Meme, etc.

HALLOSS now regens while standing up (2 per tick), and laying down (Resting, unconscious, paralyzed - 6 per tick). This fixes the 'real damage + HALLOSS = forever crit'.

Sticking a gun in your mouth (Non-stun, damage inducing) and pulling the trigger kills you.

Icon adjustments.
 2013-06-04 22:41:23 -05:00