cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 21:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,621 Commits 61 Branches 14 Tags
ddb5ffe3243fb59b8698c8fb6714cef083ebe5fb
Commit Graph

8855 Commits

Author SHA1 Message Date
bear1ake
3ed097265f Fix #8851 
also fixes unbucking and cuff breaking.
 2015-04-09 17:18:22 +09:00
Cheridan
58a362b2f1 Merge pull request #8822 from sawu-tg/blackface 
Fixes Spraycans not coloring faces correctly (and changes up lipstick)
 2015-04-09 00:20:23 -05:00
Cheridan
e31859a37e Merge pull request #8734 from MrPerson/holidazed_and_confused 
April Fool's lasts only 2 days plus another holiday
 2015-04-09 00:15:24 -05:00
phil235
a0ea5dfefe Merge branch 'master' of https://github.com/tgstation/-tg-station into ProjectileFix1 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/cat.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/mob/living/simple_animal/friendly/lizard.dm
	code/modules/mob/living/simple_animal/friendly/mouse.dm
	code/modules/mob/living/simple_animal/hostile/bees.dm
 2015-04-08 19:10:20 +02:00
Cheridan
633dc259dc Merge pull request #8751 from MrPerson/kudzu_more_like_crapzu_amirite 
Give kudzu mouse_opacity 2 so clicking them is easier
 2015-04-08 09:04:17 -05:00
Cheridan
f537b43108 Merge pull request #8789 from phil235/BeartrapFix 
Pull, resist, beartraps
 2015-04-08 08:38:01 -05:00
Jordie0608
ad33641101 Merge branch 'master' of https://github.com/tgstation/-tg-station into howdoyouknowyourbestfriendisntsecretlyawizard 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
	icons/obj/closet.dmi
 2015-04-08 22:51:45 +10:00
Jordie0608
37277f66e7 pre-map compile 2015-04-08 15:40:41 +10:00
Sawu
6103b2a5e1 Fixes Spraycans not coloring faces correctly 
* Changes Spraycans and lipstick to use a fully tintable overlay.
* Lipstick now comes in more colors and (codewise) can be changed with one var.
* Spraycans now color the face overlay correctly, racism for everyone!
 2015-04-08 15:02:32 +10:00
Cheridan
4554d54229 Merge pull request #8765 from phil235/UdderFix 
Fixes goat not producing milk and not retaliating.
 2015-04-07 19:29:12 -05:00
Iamgoofball
c06ad7e6b8 moved process() to datum. made /datum/reagents/ process instead of the containers. 2015-04-07 17:13:59 -07:00
Iamgoofball
54154bec12 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive 2015-04-07 16:21:07 -07:00
phil235
028b40ecd1 I hate fixing merge conflicts. 2015-04-07 20:51:47 +02:00
phil235
6b83575b28 Merge branch 'master' of https://github.com/tgstation/-tg-station into BeartrapFix 
Conflicts:
	code/modules/mob/living/living.dm
 2015-04-07 20:27:37 +02:00
phil235
34a2b3be5b Flying animals no longer triggers mines and mousetraps. 
Space carps are flying animals now.
Adding changelog
 2015-04-07 20:20:29 +02:00
phil235
d60df6ea2e Merge branch 'master' of https://github.com/tgstation/-tg-station into ProjectileFix1 
Conflicts:
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/living_defines.dm
 2015-04-07 01:06:38 +02:00
phil235
1f6a6b0e8c Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienIconUpdateFix 
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
 2015-04-06 19:38:51 +02:00
phil235
dd1dac556b Fixes a mob's pull not being broken when that mob is thrown. 2015-04-06 19:11:38 +02:00
phil235
8499413649 Makes living/verb/resist more object oriented. 
Adds a fourth mob size "MOB_SIZE_TINY" to differentiate corgi size and mouse size. (used in bear trap code)
Rewrites beartrap/Crossed() to have less istype checks.
Adds a flying var to simple animals (used in bear trap code)
Makes pulling update in living/life.dm() to fix pulling not stopping when you're incapacitated.
 2015-04-06 18:45:37 +02:00
WJohn
9c4e744fc9 Merge pull request #8744 from xxalpha/cyberplus 
Better sprites for chest cyber implants.
 2015-04-06 12:43:10 -04:00
Cheridan
1da595b535 Merge pull request #8737 from RemieRichards/NinjaCleanup2 
A restructure/removal/cleanup of Ninja Code [Part 2] - Abilities and stuff
 2015-04-05 21:54:33 -05:00
Remie Richards
a965f17c3c Corrects return values, fixes cell draining. 2015-04-05 22:03:41 +01:00
Remie Richards
5884c3727f Fixes nonnumerical defines, Special interaction should work nicer now. 2015-04-05 21:52:42 +01:00
phil235
e04c9ac072 Fixes goat not producing milk and not retaliating. 
Fixes bear not being able to attack you when it's AI is asleep and awaken by finding you as target.
Fixes many hostile animals not having their own attack verb text or attack sound.
Fixes goat moving even when pulled.
GiveTarget() is now called by FindTarget (because it was always called after every instances of FindTarget, and this solves the lack of retaliation).
 2015-04-05 20:30:39 +02:00
MrPerson
df4acb5043 Give kudzu mouse_opacity 2 so clicking them is easier 
Clicking anywhere on a turf not occupied by something else == clicking the kudzu. Makes them much easier to click basically.
 2015-04-04 21:28:29 -07:00
Remie Richards
cb86467e47 Consistency with X_act() names, Ninjas can now electrocute carbon mobs by "draining" them, as they would a cell/smes/mecha etc. 2015-04-05 02:30:43 +01:00
Remie Richards
9c6c68b81a Removes SpiderOS, SpiderOS Information moved to a SpiderOS Statpanel, Fixes ninja_sword_recall() by preventing a katana from ever hitting its owner (it can still hit other ninjas) 2015-04-05 01:55:27 +01:00
Remie Richards
bebe775021 Splits ninja glove drain() proc up into /atom/proc/ninjaDrainAct() 2015-04-05 00:09:28 +01:00
xxalpha
8a3e2f75a3 Better sprites for chest cyber implants. 2015-04-04 20:06:10 +01:00
phil235
6550016ee6 Merge pull request #8723 from kingofkosmos/grammarfixes 
Recieve --> Receive
 2015-04-04 20:00:21 +02:00
Remie Richards
5e93f57873 Fixes energy katana emag spam. Fixes energy nets not anchoring their target. Fixes runtime from upgrading suit cell. Ninja stars ability changed to summon one obj/item/weapon/throwing_star/ninja with throw mode auto toggle on for instant throwing. Added ninja sword recall, Allowing the ninja to recall their sword back to themselves, if they can see the sword the ability is free, and the sword throws itself towards the ninja, hitting people as it does so. 2015-04-04 18:17:37 +01:00
MrPerson
719b3e6da9 April Fool's lasts only 2 days plus another holiday 
New holiday for SS13's birthday. Or at least when it was listed on the BYOND hub, close enough.
 2015-04-04 03:33:11 -07:00
Jordie
6d34032385 Merge pull request #8628 from Fayrik/AllTheSmallThings 
Someone called for pest control?
 2015-04-04 20:58:07 +11:00
Jordie
3bb6cc8af9 Merge pull request #8625 from xxalpha/cyberplus 
Cyber Implants +
 2015-04-04 20:57:48 +11:00
Jordie
13a6a51550 Merge pull request #8689 from GunHog/InOtherNewsMoreRDsHaveBeenSpacedLately 
Removes slowdown from Reactive Teleport Armor and increases activation chance
 2015-04-04 20:57:33 +11:00
Jordie
19af7bd19e Merge pull request #8570 from RemieRichards/FireSpread 
Fire spread on mob touch
 2015-04-04 20:56:58 +11:00
Jordie
7dbd8b1d02 Merge pull request #8706 from phil235/WeakenedFix 
Fixes weakened/stunned/paralysis not going down naturally for aliens.
 2015-04-04 20:56:32 +11:00
xxalpha
7ec043a542 Added medical hud implant to CMO locker. Added chest implant sprites. 2015-04-04 00:56:06 +01:00
kingofkosmos
2e4a8fcce8 Recieve --> receive grammarfix 
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.

Fixes #8576
Fixes #8504
 2015-04-03 19:42:34 +03:00
Cheridan
0bd95eaa54 Revert "AN0N3 RUINED APRIL 1ST SO NOW I'M PRING THIS FOR REAL" 2015-04-02 21:13:50 -05:00
phil235
c5a7b174ed Fixes many mobs who should be non dense and with PASSMOB flag. 
Removes the update_slimes var from mob/living
 2015-04-03 00:33:23 +02:00
phil235
b2ed381d86 No more dense butterflies pushing mobs. 2015-04-02 23:49:04 +02:00
phil235
e834781427 Fixes weakened/stunned/paralysis not going down naturally for aliens. 2015-04-02 23:25:08 +02:00
phil235
09df1080e9 Some adjustments: 
Fixes with projectile bump() on border objects.
Fixes some projectile on_hit() not calling the parent on_hit.
Move projectile mob hit check code to mob/CanPass().
Simplifies projectile/CanPass()
Fixes runtime in projectile/Bump()
 2015-04-02 17:39:02 +02:00
Jordie
4c1c55906f Merge pull request #8666 from phil235/AnimalsUpdatehealthFix 
Fixes simple_animals being immune to fire damage melee attacks.
 2015-04-02 20:16:18 +11:00
Jordie
57e1274353 Merge pull request #8624 from Cheridan/day42_betsoff 
Day Who-Knows: Bar Gambling Expansion!
 2015-04-02 20:15:18 +11:00
GunHog
89a8e8dea4 Fixes Reactive Teleport Armor 
- Makes the armor actually teleport again!
 2015-04-01 21:14:02 -05:00
GunHog
c9e7d949e1 Buffs teleportation chance to 50 percent! 
- Also prepares the ritual sacrifice to the Eternal Jordie, God of
Changelogs.
 2015-04-01 20:49:42 -05:00
dannno
6e83015145 fixes critical priority bug 
jesus christ think of all those g's. jesus fucking christ. what have we done
 2015-04-01 21:49:14 -04:00
GunHog
1f85f785f8 Removes slowdown from Reactive Teleport Armor 2015-04-01 16:46:03 -05:00