cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 17:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,380 Commits 61 Branches 14 Tags
6f9168aee11bc1bf93db1eccd0bd91c3fb55ddb2
Commit Graph

7925 Commits

Author SHA1 Message Date
hornygranny
6f9168aee1 fixes godhand not deleting on drop 
fixes dismembering chaplains to steal the godhand
 2016-06-08 16:21:50 -07:00
oranges
d5389459fb Merge pull request #18359 from lzimann/doublesharp 
Fix dual e-swords not being able to dismember
 2016-06-09 09:16:19 +12:00
Lzimann
bd8f24f509 Moves sharpness and w_class after DNA check 2016-06-08 10:43:42 -03:00
AnturK
05b9307a09 Merge pull request #18335 from Fox-McCloud/experimental 
Experimentor Fixes
 2016-06-08 13:14:57 +02:00
AnturK
a14fe0c18b Merge pull request #18323 from KorPhaeron/clown_buff 
Clown makes a sad trombone noise on death
 2016-06-08 10:47:56 +02:00
LatD
f3545d8d3b Balances pyro anomaly (#18310) 
* End damage buff

* Nerfs constant damage
 2016-06-08 19:23:10 +12:00
oranges
c5a84c769d Merge pull request #18036 from AnturK/init_meme 
Defers some list initializations
 2016-06-08 19:20:04 +12:00
Leo
cf27511dc9 Bar stool FIGHTS (#18325) 2016-06-08 13:29:47 +12:00
Lzimann
8f014d93ca Now they actually dismember 2016-06-07 21:35:12 -03:00
Lzimann
a16ce87454 Dual e-swords dismemberment 2016-06-07 18:15:56 -03:00
oranges
0408ffa9ba Merge pull request #18299 from PKPenguin321/patch-6 
fixes hulks attacking with dual eswords
 2016-06-08 09:11:18 +12:00
Joan Lung
61c2d6aee0 Merge pull request #18279 from GunHog/Mining_Borgs_Need_Love_Too 
Mining Cyborg Hyper-Kenetic Accelerator Upgrade
 2016-06-07 17:09:39 -04:00
AnturK
19eb97ae18 Moves some list initializations to New 
Fixes missing ..() calls in New()
 2016-06-07 18:39:13 +02:00
LatD
25827d6ccb [Ready] Tweaks some R&D levels (#18246) 
Removes tech levels from some traitor objectives. They had tech levels even before the remake but apparently now that the levels got raised that became a problem. Also some small tweaks to other items to make some early levels easier to get.
 2016-06-07 20:18:19 +12:00
Fox-McCloud
4ce47d1a6f Experimentor Fixes 2016-06-07 02:10:44 -04:00
Jack Edge
8cbb10cab2 Moved dragon loot into necropolis_chests.dm 
In addition:
- Added an admin notification when dragon blood causes the dragon
transformation.
- Fixes #18275, lava staff can no longer turn transit tiles to lava.
 2016-06-07 02:57:12 +01:00
oranges
78b73b5163 Merge pull request #18292 from ChangelingRain/mercyofRATVAR 
Adds the Clockwork Obelisk, Mania Motor, and Vitality Matrix
 2016-06-07 13:08:01 +12:00
oranges
2aba5f48ef Merge pull request #18263 from pudl/big-daddy-thicc-dick 
Adds bar stools
 2016-06-07 12:59:34 +12:00
oranges
05b4e82e02 Merge pull request #18272 from xxalpha/nukemyshitup 
Syndicate toolbox now has syndicate screwdriver.
 2016-06-07 12:57:44 +12:00
KorPhaeron
3526562fa2 The joke was on me all along 2016-06-06 19:08:48 -05:00
PKPenguin321
5d76e239ef moves the parent call 2016-06-06 17:02:08 -07:00
Joan Lung
22aff568c6 but with conflictless sprites 2016-06-06 19:59:37 -04:00
KorPhaeron
cd4855688d Sad Trombone Implant 2016-06-06 18:49:14 -05:00
oranges
744b722a12 Merge pull request #18241 from phil235/BloodRefactor 
Blood refactor stuff
 2016-06-07 10:09:35 +12:00
PKPenguin321
09bb9cbcb9 fixes up some toy sword checks (#18252) 
removes broken check.
Fixes https://github.com/tgstation/tgstation/issues/18248
adds a missing return to account for nodrop items.
 2016-06-07 10:02:34 +12:00
Cheridan
35c8e92ad7 Merge pull request #18265 from KorPhaeron/sword_fix 
Sword Fix
 2016-06-06 00:39:09 -05:00
PKPenguin321
70c9cff674 fixes hulks attacking with dual eswords 2016-06-05 21:49:59 -07:00
Joan Lung
a14f601e95 fancy pulse 2016-06-05 21:04:59 -04:00
Joan Lung
f64e687250 Adds the Clockwork Obelisk, Mania Motor, and Vitality Matrix 2016-06-05 18:45:32 -04:00
phil235
94a5d5bfad Atom movable that are neither /mob nor /obj should not be picked by the closet insertion proc. (#18244) 2016-06-05 12:48:19 -05:00
GunHog
80065468d4 Hyper KA for mining borgies <3 
- Mining Cyborgs may now be upgraded with Hyper-Kenetic Accelerators
- Same cost and reqs as human version.
 2016-06-05 11:57:39 -05:00
phil235
40a371296a Adding lizard blood pack in medbay storage's freezer crate. 
Added a var/exotic_bloodtype to species, instead of hardcoding a lizard type.
Fixes proc for objects who should never be bloodied.
 2016-06-05 18:12:08 +02:00
oranges
69bd3575e3 Merge pull request #18228 from ChangelingRain/swordofRATVAR 
Additional Ratvar conversion effects and related changes
 2016-06-06 01:35:26 +12:00
oranges
3e731b117b Merge pull request #18119 from Cruix/wanted_posters 
Adds wanted posters, printable from security record computers.
 2016-06-06 01:26:35 +12:00
oranges
c09046e3f1 Merge pull request #18201 from PKPenguin321/cmo-implanter 
Refines autoimplanter code, gives CMO single use autoimplanter for HUD augment
 2016-06-06 01:25:52 +12:00
oranges
050c42ff5e Merge pull request #18174 from coiax/holodeck-cold 
Adds two new holodeck levels
 2016-06-06 01:23:43 +12:00
Nerd Lord
e816738280 Merge branch 'master' of https://github.com/tgstation/tgstation into swordofRATVAR 2016-06-05 09:03:22 -04:00
xxalpha
d1dbcd3ee0 Syndicate toolbox now has syndicate screwdriver. 2016-06-05 12:29:45 +01:00
KorPhaeron
ead7bd090a Sword Fix 2016-06-04 20:08:38 -05:00
pudl
a76f6748bd adds stupid shitty bar stools 2016-06-04 19:06:52 -05:00
Joan Lung
d81db92008 Merge pull request #18214 from coiax/follow-link-define 
Refactors all (F) links into using a define
 2016-06-04 14:36:31 -04:00
phil235
bd20c313b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into BloodRefactor 
Conflicts:
	code/__DEFINES/genetics.dm
	code/modules/mob/living/carbon/human/species_types.dm
 2016-06-04 17:41:43 +02:00
phil235
b482764a19 - I made human/handle_blood() less shitty. 
- We no longer leave a blood trail if blood_volume is below a certain level which depends on the brute damage received. This way dragging a wounded player does have a bad effect.
- We no longer give humans a second reagents var containing blood, and we don't put exotic blood in the mob's reagents. Now we don't store any blood substance inside the mob, we only have a blood_volume var. When we draw blood with syringe we create the reagent that match the type (blood reagent, or an exotic blood reagent)
- can't draw blood from mob if it's low on blood, so we can't empty a mob of its blood entirely.
- Removed the blood type preference appearing in character setting.
- blood pack automatically show blood type, unless manually labeled.
- removed bloody_hands_mob human var and same name glove var.
- Some animals now have blood (pets, goat, cows)
- hitting and dragging mobs with actual blood in their veins leaves blood on you and a trail on the floor.
- probably other stuff that I'll mention in the PR.
 2016-06-04 17:33:16 +02:00
Nerd Lord
c51b1503ac clockwork windoors 2016-06-04 10:27:27 -04:00
Nerd Lord
671521c857 layer 2016-06-04 07:37:34 -04:00
Nerd Lord
f8bd263eec Merge branch 'master' of https://github.com/tgstation/tgstation into swordofRATVAR 
Conflicts:
	icons/effects/effects.dmi
 2016-06-04 07:34:13 -04:00
TechnoAlchemist
65ba2d2800 Makes cloth not have force anymore. (#18204) 2016-06-04 01:23:29 -05:00
Nerd Lord
3793e6187a Addition Ratvar conversion effects and related changes 2016-06-03 23:19:13 -04:00
Joan Lung
6fd1424619 Merge pull request #18085 from Xhuis/earsplitting_string 
Clockwork Patch III
 2016-06-03 19:55:04 -04:00
MMMiracles
7c8603a0a8 important features (#18195) 2016-06-03 14:48:12 -05:00