cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 04:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,164 Commits 61 Branches 14 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

347 Commits

Author SHA1 Message Date
paprka
615f3f3488 Merge branch 'master' of https://github.com/tgstation/-tg-station into getshockednerd 
Conflicts:
	code/modules/mob/living/damage_procs.dm
	code/modules/projectiles/projectile.dm
 2014-12-26 16:14:19 -08:00
paprka
21df99154d Merge branch 'master' of https://github.com/tgstation/-tg-station into burtsfiya 
Conflicts:
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	icons/obj/gun.dmi
 2014-12-25 13:51:43 -08:00
paprka
10695c16b0 fixes everything, updates jitter amount 2014-12-15 01:00:53 -08:00
paprka
1fd9e6bfda Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	icons/obj/gun.dmi
 2014-12-14 21:55:28 -08:00
paprka
ddfac78cf2 initial commit for adding jitteriness for electrodes 2014-12-14 21:47:29 -08:00
paprka
ea69908122 Buff mech smg bullets a little, added changelog 2014-12-13 23:31:46 -08:00
Thunder12345
a0476d975e Movin' house 
Moved /obj/item/projectile/bullet/frag12 from
code\modules\projectiles\projectile\bullets.dm to
code\modules\projectiles\projectile\special.dm
 2014-12-11 21:23:15 +00:00
Thunder12345
8e2dc381ed FRAG-12 + admins.txt 
+ FRAG-12 shotgun shells, created from the unloaded technological
shotshell
+ Adding myself to admins.txt
 2014-12-11 21:16:45 +00:00
paprka
2315660b9f added range to the 40mm grenade 2014-12-10 23:57:12 -08:00
paprka
dc01a092af Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/gun.dmi
 2014-12-10 23:55:51 -08:00
paprka
6b474784e5 Reverts ebow stun nerf, buffs the range 2014-12-10 01:49:46 -08:00
paprka
e53f8294d7 initial commit for nerfing ranged stuns 2014-12-10 00:16:53 -08:00
paprka
b01e6ba882 Generic names and buffs 2014-12-08 16:49:48 -08:00
paprka
bcf6fe2a69 adds c90 and bulldog to summon guns, fixes 40mm flames 2014-12-08 02:04:32 -08:00
paprka
94c5ea931d functional grenade launcher shooting 2014-12-08 01:22:27 -08:00
paprka
d082cdd383 commit for grenade launcher moving 2014-12-08 00:30:10 -08:00
paprka
5b6039a521 changes to the uplink and further c90 updates 2014-12-07 19:39:24 -08:00
paprka
1a591f06e7 c90gl improvements for code, added grenade launcher as a stand-in for now 2014-12-05 20:20:45 -08:00
paprka
481fffcb08 second commit for c90gls 2014-12-05 18:13:04 -08:00
paprka
2425903320 intial commit, renames stechkin 2014-12-04 18:13:50 -08:00
Perakp
48b1ee513e Merge remote-tracking branch 'upstream/master' into wormholeProjector 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-11-29 09:37:40 +02:00
Razharas
4998b19ddf Merge pull request #5679 from Aranclanos/projectilesBump 
Projectiles bump fix, spawn() removal
 2014-11-27 03:38:05 +03:00
Aranclanos
fc1766e7c0 Readds the emitter pooling, reverting my previous commit. 2014-11-23 21:40:51 -03:00
Incoming
4a4b39b57f fixes the spider pathing 2014-11-15 14:55:48 -05:00
Incoming
fbbc77f905 Merge branch 'master' of https://github.com/tgstation/-tg-station into magicmania1.76 
Conflicts:
	code/modules/projectiles/projectile/magic.dm
 2014-11-15 14:44:51 -05:00
Jordie0608
590684e129 Merge branch 'master' of https://github.com/tgstation/-tg-station into beekeepermodewhen 
Conflicts:
	icons/mob/animal.dmi
	tgstation.dme
 2014-11-09 00:15:12 +11:00
Aranclanos
e6fd279486 Removes the spawn() in the Bump() proc of projectiles. 
Fixes issue #1291
Cleaned up some files of projectiles/firing.dm
Instead of calling process(), when firing a projectile it will use fire()
Projectiles will now use qdel(), due to this, the emitters beams won't be in the object pool.
 2014-11-04 15:21:48 -03:00
hornygranny
6e11157661 Merge pull request #5520 from paprka/minerscrubs 
Improves mining equipment prices, rebalances medipens
 2014-11-03 17:12:02 -08:00
Incoming
dd3b61d880 removes an apparently unsafe but otherwise asymptomatic qdel 2014-10-30 17:16:00 -04:00
Incoming
d2982a4b8e Adds drones, blobbernauts, magicarp, and chaos magicarp to the staff/wand of change 
Makes it so player controlled mobs with a ranged attack can actually use said ranged attack
Fixes #5551 because it's vaguely magic related anyways
 2014-10-30 14:29:06 -04:00
paprka
1b91ab24ce Improves mining equipment locker and rewards system, and buffs kinetic accelerator 2014-10-28 15:42:55 -07:00
Hornygranny
264c25b892 makes the singularity's pulling OOP with the magic of atom proc 2014-10-27 16:43:35 -07:00
Perakp
0761d42d65 Bluespace wormhole projector 
- emits quantum-coupled bluespace beams
- high research requirements: combat 6, materials 6, bluespace 4
- sprites by Nienhaus. Big thanks!
- electrodes now colored with the color var
 2014-10-26 15:06:30 +02:00
paprka
d244fd6bbd initial commit 2014-10-15 13:29:19 -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
Jordie0608
b585ddbed8 Corrects decloner beam name 2014-09-24 00:24:22 +10: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
Miauw
e3c0b2fa43 AHAHAHAHAHAHHAHAHAHAHASDHHADFHEUAHGUIHGDGIJDOINGEIOKILLTHEMALL 2014-08-24 20:35:49 +02: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
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
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
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
Ergovisavi
ff17e36750 Changes faction to list and edits hostile mobs to use the list type faction, along with changing existing factions to match the new list type 
Also changes trees and space bats to "hostile" faction because they were copypasta'd carp before that, as well as changing goats to "neutral" and attack_self 1 so that the great mining drone / goat wars end
 2014-07-12 20:03:46 -07:00