cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-27 18:12:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,496 Commits 59 Branches 14 Tags
72c6daef8bf1648f54f749d2a1129968cc0f51a3
Commit Graph

843 Commits

Author SHA1 Message Date
ACCount12
55d4c99da4 Icon change 2015-03-28 22:27:23 +12:00
ACCount12
edace66c47 Fix 2015-03-28 22:15:20 +12:00
ACCount12
fd3f3ab68b New pins 2015-03-28 22:02:44 +12:00
pudl
0964979a90 bitch says she wanna keep her throat warm 2015-03-26 21:16:25 -05:00
pudl
4c51941e6e reverts an accidental change 2015-03-25 21:12:25 -05:00
phil235
1b3eb49a1d Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/slime/say.dm
 2015-03-26 02:31:06 +01:00
pudl
69924a15be plasma/ripley update 2015-03-25 18:06:26 -05:00
Jordie
9a217503aa Merge pull request #8451 from Fayrik/FoamForceFuckYeah 
Foam force fuck yeah!
 2015-03-25 16:30:42 +11:00
phil235
ffd711c26f Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
 2015-03-23 16:51:03 +01:00
Cheridan
beacf0cf4a Merge pull request #8349 from MrPerson/qdel_reagents_hopefully 
Fix reagent garbage collection hopefully
 2015-03-23 08:55:11 -05:00
Fayrik
117d9d11cd Riot darts are now available to Nuke ops and Traitors. And I am SO done with this. 2015-03-22 22:11:56 +00:00
Swag McYolosteinen
53e40ec315 Merge pull request #8427 from Cheridan/day3_collars 
Event Day 3 - Pet Collars!
 2015-03-22 19:37:12 +01:00
MrPerson
9229f72573 Fix up certain chemicals to not overwrite Del(). Meh. 
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_reagents_hopefully

Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
 2015-03-21 23:04:53 -07:00
Fayrik
0173c7af6e Adds everything and makes it all work perfectly. It's like I'm almost good at this or something. (Seriously, points of interest: Secbots react to being shot. Dart rigging. Donksoft guns.) 2015-03-21 16:18:32 +00:00
Fayrik
d3d491588e Cleaned up the functionality and prepared things for PR. 2015-03-20 23:19:19 +00:00
Fayrik
57f544ffdf Removed dangerous "hacked" foam darts, as they were a little more powerful than intended. Hopefully this is something I can fix at a later date. Fixed non-magazine ammo boxes not accepting their correct ammo type. Added a speed collection system to all ammo boxes. Finally balanced out the cargo ordering stuff. 2015-03-20 23:19:04 +00:00
Fayrik
a030c9889e Glorious second commit, introducing (mildly) dangerous rounds and a new suicide check. 2015-03-20 23:03:06 +00:00
Fayrik
b758992e8c First (of probably several) commits to add Foam Force toy guns. Adds the new guns and crossbow, removes the old crossbow, and makes these new guns available to cargo. 2015-03-20 23:02:53 +00:00
phil235
aecb365f84 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/simple_animal/slime/life.dm
 2015-03-20 19:32:16 +01:00
Cheridan
7149f0382d Adds Pet Collars! 
Map needs update now
 2015-03-18 21:27:21 -05:00
Menshin
ca9f31a0e3 * Unified the firing proc for energy and ballistics mech guns 
* Fixes incendiaries bullets runtiming on qdel
 2015-03-17 23:58:03 +01:00
Jordie0608
f0731d01e2 changelog compiled 2015-03-17 20:03:31 +11:00
Jordie
fb6aa85094 Merge pull request #8274 from Thunder12345/techshellening 
Shotgun party, new shells, an improvement and a fix
 2015-03-16 18:30:14 +11:00
Cheridan
3bc34e5383 Merge pull request #8310 from phil235/RussianRevolverFix 
Fixes russian revolver's special mechanism message
 2015-03-15 01:57:46 -05:00
MrPerson
7c305305b7 Fix reagent garbage collection hopefully 
I say hopefully because stuff that collects successfully locally likes to fail on sybil.
 2015-03-14 16:52:49 -07:00
phil235
456a64f8fd slime from carbon to simple animal 2015-03-14 23:40:57 +01:00
Cheridan
24b2d03e0f Merge pull request #8283 from Miauw62/taserdelayymao 
Reduces the taser firing delay.
 2015-03-13 12:58:24 -05:00
phil235
921ed1330e Fixes russian revolver's special mechanism message appearing when placing it on a table or in your inventory. 
Fixes its description about auto spinning barrel.
Fixes its behavior when used as a melee weapon.
 2015-03-12 14:34:23 +01:00
Thunder12345
8a780e89bf Overloading improvised shells 
Improvised shells can be overloaded with black powder to have a random
pellet count and damage for each pellet. Damage ranges from 0 to 80.
 2015-03-11 11:41:26 +00:00
phil235
cb96e65f1b Merge pull request #8254 from Steelpoint/HoSGunSpelling 
[BALANCE]Buffs the Head of Security's Firearm.
 2015-03-10 22:09:46 +01:00
Miauw
09cf2e474f Reduces the taser firing delay. 2015-03-10 19:36:05 +01:00
Thunder12345
9723f6d092 Laser slugs + improvised shell fix 
Adds laser slugs, fixes improvised slug recipe
 2015-03-10 15:55:29 +00:00
Thunder12345
56ab83d4e7 Ion shell updates 
Ion shell now acts as a shotgun of weaker ion bolts. Stronger than a
regular ion rifle when fired point blank, but suffers at longer ranges.
 2015-03-10 14:42:08 +00:00
Thunder12345
a1a5edd314 FRAG-12, ion, improvised shotgun shells 
Adds: Ion slug, ion rifle in a shotgun shell
Improves: Improvised shell, new sprite + recipe
Fixes: FRAG-12 slug, now with 100% more explosion
 2015-03-10 13:57:54 +00:00
Steelpoint
a5ba5972b4 AdditionalSpelling 2015-03-10 17:26:05 +08:00
Steelpoint
79857b0eac InitalCommit 2015-03-09 17:02:34 +08:00
Cheridan
7ec6ad84cd Merge branch 'renamingandreskinning' of git://github.com/paprka/-tg-station into paprka-renamingandreskinning 
Conflicts:
	icons/mob/back.dmi
 2015-03-08 23:15:22 -05:00
Cheridan
e2554c55e6 Merge pull request #8147 from Cheridan/master 
Manual Merge of #7607
 2015-03-04 00:39:34 -06:00
Cheridan
56b0c321ac Merge branch 'BlobReroll' of git://github.com/RemieRichards/-tg-station into RemieRichards-BlobReroll 
Conflicts:
	code/game/gamemodes/blob/overmind.dm
 2015-03-04 00:33:44 -06:00
Cheridan
3fd821bdd7 Merge pull request #7986 from phil235/TaserJitterFix 
Fixes taser stun duration
 2015-03-04 00:01:49 -06:00
Remie Richards
736ffafa55 Merge branch 'master' of https://github.com/tgstation/-tg-station into BlobReroll 
Conflicts:
	code/game/gamemodes/blob/blobs/blob_mobs.dm
	code/game/gamemodes/blob/blobs/core.dm
 2015-03-01 00:18:19 +00:00
phil235
809a1be279 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants 
Conflicts:
	icons/mob/head.dmi
 2015-02-25 18:50:42 +01:00
phil235
d4711bbc72 Fixes taser stun duration to be back to normal, also jitter animation now only starts after the mob falls to the ground. 2015-02-25 15:24:06 +01:00
paprka
9e450b30df further improvements and changelog 2015-02-25 00:25:27 -08:00
paprka
7a8e78a4c3 this kills the object verbs 2015-02-25 00:19:53 -08:00
Steelpoint
9ce2add084 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun 
Conflicts:
	icons/obj/guns/energy.dmi
 2015-02-25 14:10:54 +08:00
paprka
1d552123dc hos gun revert 2015-02-24 21:54:48 -08:00
paprka
7fad8a3bab nerfs energy bolts more 2015-02-24 20:04:48 -08:00
paprka
393123b50b Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs 
Conflicts:
	code/modules/projectiles/gun.dm
	icons/obj/guns/energy.dmi
 2015-02-24 20:03:33 -08:00
Steelpoint
da53175ad5 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun 
Conflicts:
	icons/mob/inhands/guns_lefthand.dmi
	icons/mob/inhands/guns_righthand.dmi
	icons/obj/guns/energy.dmi
 2015-02-25 11:44:27 +08:00