cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,045 Commits 21 Branches 0 Tags
15439b8c4e7695461cce9f70a3b409e1e2a6985f
Commit Graph

606 Commits

Author SHA1 Message Date
paprka
2a8e772131 Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns 
Conflicts:
	code/modules/projectiles/ammunition/magazines.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	icons/mob/back.dmi
	icons/obj/gun.dmi
 2014-10-19 17:30:47 -07:00
paprka
929662ad3a moved files and fixed tablecrafting 2014-10-17 10:30:04 -07:00
paprka
f54cafad83 converted most gun crafting to its own module 2014-10-17 09:15:54 -07:00
paprka
eb6e35bb54 adds sawing off to improvised shotgun 2014-10-16 10:52:42 -07:00
paprka
d244fd6bbd initial commit 2014-10-15 13:29:19 -07:00
phil235
45cfe07f98 Merge branch 'master' of https://github.com/tgstation/-tg-station into DisplacedGirderFix 
Conflicts:
	code/modules/recycling/disposal.dm
 2014-10-15 18:23:40 +02:00
phil235
dbea503e88 Removing the fourth argument (air_group) of CanPass() everywhere, because it isn't used anywhere. 
Fixing one instance of "for(mob in viewers) show_message()" to "visible_message()"
 2014-10-15 18:03:06 +02:00
Jordie0608
1fd21a130b Makes riot shotgun unique 2014-10-14 15:47:43 +11:00
Jordie0608
aabab6cf47 Defines riot shotgun for spawn in the armory 2014-10-14 01:28:53 +11:00
Swag McYolosteinen
8589c8c874 Merge pull request #5120 from nivomi/turretsounds 
Make spawned turrets use projectile-appropriate SFX
 2014-10-08 20:57:21 +02:00
Remie Richards
8503bd632b Merge pull request #5103 from paprka/largebow 
Readds large crossbow to protolathe
 2014-10-08 10:18:51 +01:00
nobalm
0a1df18f25 Turret SFX and spawning changes 
* Turrets now use the SFX associated with the weapon installed in them
* Turrets now have a default installed gun for when they are spawned
* fire_sound is now a property of all ammunition, not just energy ammo,
which should make future additions a lot simpler.
* Added some energy gun SFX handling to the giant switch statement at
the top of portable_turret.dm, because 'emagged' and 'lethal' are the
same thing and have to be handled weirdly.
* The upshot of all these changes is that every turret, constructed or
default, should make exactly the right noise, even if guns are added in
the future!
 2014-10-07 16:44:51 -04:00
Remie Richards
5b8b883cf0 Merge pull request #5050 from Incoming5643/spiders,man 
Updates spiders to have full player functionality
 2014-10-06 14:24:39 +01:00
paprka
d67e5a4810 readds large crossbro to protolathe 2014-10-05 15:20:10 -07:00
Cheridan
08be1b34eb Revert "Changes a few green crosses to blue on sprites that I missed last time" 2014-10-04 19:22:10 -05:00
MrPerson
651c3e6db5 Merge to master - sole conflicting file was ninja.dm FUCK NINJAS 2014-10-04 01:45:39 -07:00
Incoming
8e99152226 Updates spiders to have full player functionality 
*All spiders can now web turf (but AI controlled non-nurses won't choose to), only nurse spiders can wrap items and lay eggs.
*Eggs laid by a player controlled nurse spider will eventually grow into player controlled spiders, while AI lain eggs will only result in AI spiders
*Adds non nurse spiders to the staff of change as they pass my rules for inclusion (Leaves a corpse, can do everything as a player the NPC can do, can't dominate a round by reproduction)

I take no responsibility for spidercode, it's a bit iffy but as far as I can tell it all works for players now.
 2014-10-01 18:58:07 -04:00
paprka
3fca874ea3 even more code optimizing 2014-10-01 15:12:21 -07:00
paprka
ca9ab8ebd7 updated coding 2014-09-30 16:34:16 -07:00
paprka
6db18cff96 initial commit 2014-09-30 13:41:02 -07:00
Jordie0608
b585ddbed8 Corrects decloner beam name 2014-09-24 00:24:22 +10:00
Swag McYolosteinen
ca714ca8c2 Merge pull request #4639 from RemieRichards/AtomPool 
/tg/station Atom/Movable Pool + Pooling of Emitter beams and Say() Virtualspeakers
 2014-09-19 20:03:24 +02:00
Aranclanos
70d70946d1 Removed the *click* black text that all mobs get when a gun can't fire. The red *click* will still appear to the gun wielder. 2014-09-02 22:22:47 -03:00
Remie Richards
ee85f7eced /tg/station Atom Pool + AtomPooling of Emitter beams. 2014-09-02 00:13:06 +01:00
Miauw
78a9b0be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into say() 
Conflicts:
	code/__HELPERS/game.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/requests_console.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/objects/items/devices/PDA/radio.dm
	code/game/objects/items/devices/aicard.dm
	code/modules/admin/admin_verbs.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/voice.dm
	code/modules/mob/living/carbon/brain/brain.dm
	code/modules/mob/living/carbon/human/whisper.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/say.dm
 2014-08-31 13:40:16 +02:00
MrPerson
a23dbe2357 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor 
Conflicts:
	code/game/objects/items/devices/radio/radio.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/events/ninja.dm
	code/modules/power/cell.dm
	code/modules/power/port_gen.dm
	code/modules/reagents/reagent_dispenser.dm
 2014-08-29 04:21:15 -07:00
Menshin
0f3b711629 Tidying presentation 2014-08-27 21:07:52 +02:00
Menshin
bdca196312 Fix wands losing a charge even when no shot was actually fired (#4588). 2014-08-27 19:54:46 +02:00
Miauw
e3c0b2fa43 AHAHAHAHAHAHHAHAHAHAHASDHHADFHEUAHGUIHGDGIJDOINGEIOKILLTHEMALL 2014-08-24 20:35:49 +02:00
Firecage
0948391502 Span classes for files in the following Modules folders: Power, Projectiles, Reagents, Recycling, Research 2014-08-23 02:02:46 +02:00
MrPerson
d0c97aae72 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor 
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/game/gamemodes/cult/ritual.dm
	code/game/gamemodes/nuclear/pinpointer.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/status_display.dm
	code/game/objects/effects/decals/crayon.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/airlock_painter.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/storage/secure.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/mousetrap.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/slime/examine.dm
	code/modules/power/cable.dm
	code/modules/reagents/grenade_launcher.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/recycling/sortingmachinery.dm

Thanks Firecage, this is all your fault
 2014-08-20 05:54:20 -07:00
Alex
99fae13391 Merge pull request #4393 from paprka/emptyclick 
Empty gun click noise
 2014-08-19 10:36:06 +01:00
Cheridan
148d16397b Advanced Shotshells 
adds 3 new types of shotgun ammo. make them by crafting the special shell in RND, and then using table-crafting to make the unique ammo.dmi

meteorshot, made with compressed matter cartridges
pulse slugs, shotgun rounds with the properties of a laser weapon.
dragonsbreath rounds, area-of-effect flame weapons.
renames ammunition/bullets.dm to ammunition/ammo_casings.dm, which is more accurate

splits RND designs up into their own files
 2014-08-14 12:15:10 -05:00
Cheridan
a6cc26c50e Incendiary shotgun shells are now dragonbreath shells. 
Adds meteorshot.
 2014-08-13 13:36:07 -05:00
Cheridan
cb4c589c80 Merge pull request #4387 from Incoming5643/fireball 
Magic Mania 1.67: Great Balls of Fireballs
 2014-08-12 12:33:50 -05:00
paprka
bbf90b10d3 span fixes 2014-08-12 02:15:07 -07:00
paprka
e97f21a24a empty weapon click 2014-08-11 22:56:05 -07:00
Incoming
41596a0974 Magic Mania 1.67: Great Balls of Fireballs 
Changes the wand of fireball projectile to have the same !!FUN!! proximity detonation properties as the spell version. Slightly moved the damage types from getting hit by the fireball around to better simulate the experience.

Fun fact about spell fireballs: Because the projectile is desiged to explode if it comes within a square of somebody who isn't the wizard direct contact between fireballs and mobs is very rare. This means that while the fireballs are designed to do an extra 25 brute and 20 burn ON CONTACT this usually doesn't happen.

That's why the added damage on the wand here isn't 25/20, because that would actually make it signigicantly better than the spell.
 2014-08-10 20:12:49 -04:00
paprka
a65d26f792 Merge remote-tracking branch 'remotes/upstream/master' into deepgunlore 
Conflicts:
	code/modules/projectiles/projectile.dm
 2014-08-08 06:48:17 -07:00
Swag McYolosteinen
63692588b9 Merge pull request #4346 from Firecage/FUCKINABSOLUTEPATHS 
CLUCKING ABSOLUTE PATHS
 2014-08-08 12:15:22 +02:00
paprka
64bc2abec3 sprite and fix 2014-08-07 14:52:40 -07:00
paprka
726b939754 whole bunch of gun stuff 2014-08-07 14:39:31 -07:00
Firecage
40de38f252 moremoarmoaaaaarabsolutes 2014-08-06 16:54:06 +02:00
Alex
c79b9fe6bf Merge pull request #4336 from Incoming5643/bluepanties 
Magic Mania 1⅔: Fixes #4335
 2014-08-06 10:41:07 +01:00
Incoming
879f5d7c0e Changed it! 2014-08-05 19:51:08 -04:00
Incoming
4e91b2b655 Simplifies the species picking 
Adds an update_icons() to minimize the effects of #4252, but it's still a problem
 2014-08-05 14:11:45 -04:00
Incoming
2283b303ac Fixes #4335 
Readds the 1/12 chance of stumbling out the bolt of change fully human with no mutantrace. It must have gotten lost during the mutantrace datumizing
 2014-08-04 17:51:33 -04:00
Aranclanos
ccae5781c5 added two defines CLICK_CD_RANGE and CLICK_CD_MELEE (4 and 8), replaced all changeNext_move() procs to use these two defines. 
Added melee click cooldown for paper spam on cameras.
 2014-08-03 22:14:56 -03:00
KyrahAbattoir
fcb2fb9de3 Another lowercasing pass on a bunch of items and furnitures. 
Synthflesh should be a plural.
Leg cuffs is better than legcuffs.
LaserTag -> laser tag is not a brand name.
centcom -> Centcom is always capitalised.
 2014-07-27 19:14:40 +02:00
Ergovisavi
9d643789d8 Fix for issue #4173, both soulstone mobs (and construct derivatives) and staff of animation mobs (statues included) are now properly tagged with a faction that is unique to the person that created them, stopping a Wizard's animated mimics from attacking his created constructs. 2014-07-17 00:40:24 -07:00