cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 05:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,800 Commits 61 Branches 14 Tags
4be1bfbbd2d3c8208cc24de7fffd640a365546fa
Commit Graph

3831 Commits

Author SHA1 Message Date
Razharas
db672c359e Merge pull request #12834 from Incoming5643/supermatter_sword 
Supermatter sword fixes
 2015-11-07 06:09:26 +03:00
Razharas
5e736281a7 Merge pull request #12871 from YotaXP/origin_tech_fix 
Fixed bad `origin_tech` values.
 2015-11-07 06:06:48 +03:00
Nerd Lord
0f23809346 Revenant changes XVIII 
Made the abilities easier to tweak and somewhat less copypasta. They're still for() loops though.
Check the changelog for additional details.
 2015-11-05 18:50:51 -05:00
YotaXP
2ffc5f055c Fixed bad origin_tech values. 2015-11-05 15:32:25 -05:00
Incoming5643
555c37625b Adds force and armour_penetriation to the supermatter sword 2015-11-03 02:47:26 -05:00
Cuboos
f136955d80 Created a new flashbang sound and a ringing effect for when you go deaf, very realistic, it's almost like your ears are actually bleeding (NOTE: that is a joke, this isn't actually a painful sound, i checked) 2015-11-01 18:51:00 -08:00
Remie Richards
046948f314 Merge pull request #12630 from KorPhaeron/Reflector 
Laser Reflector Structure
 2015-11-01 21:46:29 +00:00
Razharas
f618a4690b Merge pull request #12752 from KorPhaeron/xenobiology2 
Xenobiology Control Console
 2015-11-01 18:30:34 +03:00
KorPhaeron
f58dcd9e5d 3 types 2015-11-01 09:08:15 -06:00
Razharas
8b22368202 Merge pull request #12678 from MMMiracles/asmartidea 
Esword Embedding
 2015-11-01 16:17:01 +03:00
KorPhaeron
5a781f93df Merge remote-tracking branch 'refs/remotes/tgstation/master' into xenobiology2 2015-10-31 21:47:10 -05:00
Incoming
74f00a016d Merge branch 'master' of https://github.com/tgstation/-tg-station into supermatter_sword 
Conflicts:
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/obj/weapons.dmi
 2015-10-31 19:56:13 -04:00
Incoming
a9138e84c1 *Adds supermatter sword sprites 
*Makes bullets that hit the supermatter sword get eaten
*Fixes some edge cases where a sword could eat itself
*Improves atmos handling
 2015-10-31 19:48:24 -04:00
Razharas
9ee8d1c256 Merge pull request #12589 from Cheridan/5e 
Upgrades Paladin to Fifth Edition
 2015-11-01 02:09:01 +03:00
Razharas
590644c06e Merge pull request #12686 from Firecage/jetpackobjective 
Changes jetpack objective
 2015-10-31 21:42:07 +03:00
KorPhaeron
d87803fdb4 Slime blueprints 2015-10-30 04:42:20 -05:00
Jordie
a09d69e985 Merge pull request #12330 from feemjmeem/tanksuicide-refactor 
re-enable tank suicide, but retain body and all objects
 2015-10-29 14:27:37 +11:00
Cheridan
62527884ed Merge pull request #12702 from optimumtact/pkpenguin 
Adds a surgery to attach a chainsaw to your hand
 2015-10-28 18:08:36 -05:00
Cheridan
f00b6101e7 Merge pull request #12698 from Firecage/youcandoitlilmonkey 
Allows monkeys to use ointments and brute packs.
 2015-10-28 17:51:56 -05:00
Razharas
6d89f6cd69 Merge pull request #12687 from tkdrg/uncreative_branch_name 
Fixes chainsaws losing force when dropped
 2015-10-28 19:30:22 +03:00
Razharas
9357602233 Merge pull request #12665 from tkdrg/ghost_medsechuds 
[READY] Adds a ghost on-screen HUD
 2015-10-28 05:19:19 +03:00
Tkdrg
dd20530f0e Adds ghost alerts. 
Adds ghost alerts for revival (cloning, MMIs, nar-sie, drones, etc).
 2015-10-27 23:07:41 -03:00
PKPenguin321
fe8d0e58cd Adds a surgery to attach a chainsaw to your hand 
Once added you cannot remove the chainsaw and the hand will be forever
used
 2015-10-28 12:16:58 +13:00
Firecage
69ed8e756d Allows monkeys to use ointments and brute packs. 2015-10-28 00:10:11 +02:00
MMMiracles
2bcc3aeb9e Embed chance of 75% because having less than 1/2 of a chance of your magic death stick being tossed into your enemy's hand could only go right. 
Also changelog.
 2015-10-27 16:06:02 -04:00
Cheridan
fe41766141 Merge pull request #12658 from francinum/patch-7 
chainsaw is too cumbersome to carry in one hand!
 2015-10-27 11:12:08 -05:00
Firecage
d040083bf5 Adds the captains jetpack, both as an item and the new objective. 2015-10-27 17:34:27 +02:00
Razharas
ba1b70106d Merge pull request #12497 from bgobandit/ayyyfixes 
Even more xenobiology fixes and tweaks
 2015-10-27 18:28:48 +03:00
Tkdrg
2b1a1f42fd Fixes chainsaws losing force when dropped 
Fixes #12683
 2015-10-27 11:36:55 -03:00
MMMiracles
37ea3902e1 Allows eswords to embed if thrown. If you're crazy enough to throw your death stick at the guy you're trying to kill you should be rewarded for actually hitting. 2015-10-26 23:56:16 -04:00
francinum
86f5a28e73 Update twohanded.dm 2015-10-26 13:27:24 -04:00
francinum
faeabc713f Makes Twohand Required pickup use wield() 
Fucking Ergo.
 2015-10-26 13:18:11 -04:00
francinum
659823392f You drop The Murderfucker. 
the to \the
 2015-10-26 12:51:28 -04:00
francinum
571627b501 Goddamnit. 2015-10-25 22:41:11 -04:00
francinum
0f3a6d11c3 You drop the chainsaw. 2015-10-25 22:40:02 -04:00
Incoming
5a4d72f5a4 *Supermatter sword will now passively eat through anything you put it in, and burn through the floor it's resting on! 
*Supermatter sword now laughs at explosions and acid!
 2015-10-25 22:08:22 -04:00
francinum
44f3e23bf0 chainsaw is too cumbersome to carry in one hand! 2015-10-25 22:01:30 -04:00
Cheridan
a53d35e00c Merge pull request #12548 from tkdrg/ilive_again 
Adds Chainsaws
 2015-10-25 13:09:55 -05:00
Cheridan
b10368c3e3 Merge pull request #12306 from Incoming5643/RTD 
Adds d1 and d100 dice
 2015-10-25 05:19:17 -05:00
Incoming
ef24943bc9 SUPERMATTER SWORD! 
It's a sword made of supermatter! It'll dust nearly anything! It's hilariously lethal to actually attack with without radiation shielding! It's still eventually lethal even WITH radiation shielding! Admin Only! Good Ideas!
 2015-10-25 03:15:07 -04:00
Cheridan
6bfa738a24 Merge pull request #12567 from phil235/EffectSystemTweak 
Makes effect system code more OOP.
 2015-10-22 21:00:10 -05:00
Cheridan
1d2b60b227 Typo fix 2015-10-22 11:20:48 -05:00
Cheridan
b246835ed0 I like this path name better 2015-10-22 11:19:44 -05:00
Cheridan
5527b20a11 Upgrades SS13 to Fifth Edition 2015-10-22 11:15:46 -05:00
Razharas
e1bad58c4a Merge pull request #12503 from Robustin/master 
Pneumatic Nerf
 2015-10-22 09:33:02 +03:00
phil235
fb7ad8b38f Merge pull request #12452 from Xhuis/radical 
Radiation tweaks and a geiger counter
 2015-10-22 01:13:00 +02:00
Tkdrg
0458f939b4 Adds Chainsaws 
Happy Halloween!

Sprites by WalterJe.

These are force 21 two-handed weapons. They are sharp and can be
tablecrafted by spending one circular saw, one plasteel sheet, and one cable
coil, plus a welding tool for crafting. The sound used is from the
freesounds.org and was released into the public domain. It is available
at https://www.freesound.org/people/esperri/sounds/118972/.

This is a rehash of PR #6320 if you're feeling dejavu.
 2015-10-21 20:11:29 -03:00
phil235
261ee72cce Merge pull request #12511 from KorPhaeron/icon 
Fixes icon not updating when you craft an explosive lance
 2015-10-22 00:47:31 +02:00
phil235
d3ee910211 Makes effect system code more OOP. 
obj/effect/effect is now renamed obj/effect/particle_effect for better usability.
datum/effect/system and /datum/effect/effect/system are now both /datum/effect_system.
Fixes a bug where wall mounted igniters (and other spark producing objects) didn't produce sparks sometimes.
Moved explosion_particles.dm into the effect_system folder, because it has effect_systems code.
 2015-10-21 23:28:29 +02:00
Cheridan
b31f114940 Merge pull request #12510 from Core0verload/tankytanksoftank 
Buffs big air/oxy tanks damage to 10
 2015-10-20 17:47:30 -05:00