cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 10:53:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,670 Commits 62 Branches 14 Tags
f31cc6e6cffa74754ed327debaefe49f833801e3
Commit Graph

6314 Commits

Author SHA1 Message Date
Robustin
c535ea783e Update human.dm 2016-02-22 16:28:42 -05:00
Robustin
d9c6dfce73 Update mob_helpers.dm 2016-02-22 16:27:28 -05:00
Robustin
320b1e958c Update mob_helpers.dm 2016-02-22 13:24:08 -05:00
Cheridan
d6d8f59db4 Merge pull request #15445 from Shadowlight213/Syndieboom 
Fixes away mission loot station balance by removing loot drops from syndicate simple mobs.
 2016-02-21 23:15:47 -06:00
Cheridan
56d68ce31f Merge pull request #15614 from CPTANT/staminabuffnew 
buffs stamina regeneration take 2
 2016-02-21 20:12:44 -06:00
Joan Lung
b08f6d9c22 Merge pull request #15624 from phil235/DwarfFix 
Fixes being able to become huge with genetics
 2016-02-21 19:29:51 -05:00
Joan Lung
ab658b9e24 Merge pull request #15628 from PKPenguin321/patch-13 
[s] Fixes nasty cleanbot bug
 2016-02-20 17:47:46 -05:00
tkdrg
001b575898 Merge pull request #15151 from CPTANT/laserfire 
Laser beams may now set you on fire
 2016-02-20 19:19:22 -03:00
Tkdrg
4390482fac Merge branch 'Shadowlight213-Soundflip' into HEAD 
Closes #15502
 2016-02-20 16:00:11 -03:00
Shadowlight213
07565ffaa5 Reverses Announcement sound pref to hopefully fix it starting off. 2016-02-20 15:59:15 -03:00
tkdrg
9eb1ff8274 Merge pull request #15625 from phil235/WearmaskInternalIconFix 
Fixes internals not being turned off immediately when adjusting your mask off
 2016-02-20 15:03:16 -03:00
tkdrg
0c55904f2a Merge pull request #15623 from Core0verload/runtime 
Fixes a spacewalking runtime
 2016-02-20 10:00:05 -03:00
PKPenguin321
db419d8008 makes the acid value even lower 
by request
 2016-02-19 13:57:09 -08:00
PKPenguin321
0fe58646c6 fixes massive math error in cleanbot.dm 
turns out that as it would happen, testing your code doesn't always account for things like this
that being said, this is tested and still strong, but not 1200 damage strong
 2016-02-19 12:43:43 -08:00
xxalpha
1a4206c77b Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-19 18:32:07 +00:00
phil235
887822edd5 Fixes being able to become huge by injecting yourself with dwarfism while having mutadone in you. The resizing now happens instantly and no longer waits for the next life() call. 
Fixes resizing. It was broken because I had removed update_canmove() call in living/life(). Now every part of the code that modifies resize directly calls update_transform().

Fixes mob seeing two messages when acquiring (or losing) the dwarfism mutation.
 2016-02-19 18:32:29 +01:00
phil235
9ece63edfe Fixes internals not being turned off immediately when adjusting your mask off. 2016-02-19 17:49:38 +01:00
c0
0bb0c58e6d Fixes a spacewalking runtime 2016-02-19 13:20:09 +03:00
duncathan salt
db5c47b6b2 Merge pull request #15598 from Incoming5643/ape_escape_2 
Adds the new pun pun to the maps
 2016-02-19 04:09:18 -06:00
duncathan salt
ad11039232 Merge pull request #15568 from PKPenguin321/patch-13 
Pisses off the cleanbots
 2016-02-18 18:00:21 -06:00
Incoming5643
611248a4f8 Fixes Travis 2016-02-18 18:27:35 -05:00
CPTANT
cd0a866daa buffs stamina regeneration 2016-02-18 22:53:49 +01:00
Incoming
dd8b4f5568 Adds a bunch of ape names from the forum/previous pull. 
Adds a rare pet list for some of the most supreme of meme names.
 2016-02-18 12:08:45 -05:00
AnturK
56d2a34201 Splits beds and chairs 
Adds deconstruct structure helper
Moves chair sprites from objects.dmi to chairs.dmi
Fixes check shields passing proper flags on unarmed attacks
Makes stools and chairs able to be picked up
 2016-02-18 17:55:38 +01:00
Cheridan
cfcecba389 Merge pull request #15575 from phil235/ReviveFix1 
Fixes mob revival
 2016-02-17 20:42:10 -06:00
tkdrg
2934e6c8b7 Merge pull request #15165 from xxalpha/urange 
ultra range again
 2016-02-17 21:32:38 -03:00
tkdrg
2b96cbbdce Merge pull request #15574 from KazeEspada/Bagfixes 
Bag tweaks.
 2016-02-17 21:29:05 -03:00
PKPenguin321
fc9bf6479c changes proc to acid_act(), adds more messages 
cleanbots will rise
 2016-02-17 15:50:13 -08:00
duncathan salt
b8946d608e Merge pull request #15480 from bgobandit/kitty 
Cats now display a variety of catlike behaviors!
 2016-02-17 17:07:05 -06:00
AnturK
3c8652e346 Merge pull request #15504 from phil235/HatMaskFacialHairFixes 
Fixes mask and head gear issues
 2016-02-17 21:47:17 +01:00
Cheridan
9c4d90c72c Merge pull request #15564 from Incoming5643/ape_escape 
Pun Pun has gained a few persistence save file features
 2016-02-17 12:42:37 -06:00
xxalpha
238329dba3 Removed mecha pilots from event; added no loot syndies 2016-02-17 15:05:21 +00:00
xxalpha
7c0c66dba3 Merge remote-tracking branch 'upstream/master' into urange 2016-02-17 14:21:29 +00:00
PKPenguin321
cebb046145 adds sfx, tweaks damage, changes proc to apply_damage() 
known bugs: apply_damage isn't properly accounting for armor
 2016-02-16 18:21:45 -08:00
phil235
2dd476f13e Fixes shaking someone resting not making them stand up. 
Fixes shaking someone not reducing the sleeping var if the mob asleep is buckled to stand up.
Fixes merge conflict issues.
Fixes my revive code leaving the revived AI blind.
 2016-02-17 01:23:36 +01:00
phil235
5db3ab47c7 Merge branch 'master' of https://github.com/tgstation/-tg-station into ReviveFix1 
Conflicts:
	code/game/machinery/computer/aifixer.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/robot.dm
 2016-02-17 00:33:26 +01:00
phil235
7e1efca13a Created two new procs to handle reviving mobs more easily: 
- can_be_revived(), used so we don't revive a mob who would immediately die again (lack of brain organ for carbons).
- fully_heal(), called by revive when we want to completely heal a mob before trying to ressuscitate it.

I gave some arguments to revive() so the proc can be used by more than just the admin healing code (ai revived by the AI fixer console, drone revived by another drone clicking it, strange reagent ressuscitating you, borg revived by restart circuitboard, changeling using his revive ability, etc)

This fixes borg revival not updating its vision correctly and not updating the diagnostic HUD. Same fix for changeling revival.
 2016-02-16 23:27:08 +01:00
Cheridan
c1a1e90ca7 Merge pull request #15536 from optimumtact/spidersspiderseverywhere 
Don't allow every single spider to be player controllable
 2016-02-16 15:47:15 -06:00
KazeEspada
5d8d5854f9 Bag tweaks. 
Department Backpacks are now the default(instead of grey backpacks).

Fixed an error on humans where new humans would have an integer for their backpack.

This will not affect current preferences.
 2016-02-16 14:03:35 -07:00
PKPenguin321
4a326e35a0 gives cleanbots a new emag function 
they kill people now
 2016-02-16 00:33:23 -08:00
CPTANT
086dd558f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into laserfire 
# Conflicts:
#	code/game/gamemodes/malfunction/Malf_Modules.dm
 2016-02-16 03:23:55 +01:00
Incoming
f61707c6f9 Pun Pun has gained a few persistence save file features 
Whatever Pun Pun is wearing on his/her head and face at round end will still be there at the start of the next round. Back and hands do not save for obvious balance reasons.
If Pun Pun dies but leaves an intact corpses his/her successor will be named Pun Pun II and inherit the items his corpse was wearing at the end of the round.
If Pun Pun gets gibbed the chain of monkeys is broken and the next round monkey will be a new progenitor with a potentially different name. Obviously their items won't be saved in this case.
 2016-02-15 21:20:29 -05:00
AnturK
7ede85391f Merge pull request #15527 from phil235/ReviveFixes 
Fixes blindness overlay after reviving.
 2016-02-15 23:17:55 +01:00
oranges
b496ca6043 Don't allow every single spider to be player controllable 2016-02-16 10:00:23 +13:00
Incoming
57c9c08bef Merge branch 'master' of https://github.com/tgstation/-tg-station into I_dont_know_why_Im_doing_this_but_its_not_your_job_to_stop_me 
# Conflicts:
#	code/modules/mob/living/simple_animal/parrot.dm
 2016-02-14 17:57:03 -05:00
Incoming5643
4d199e699d adds speech_shuffle_rate as a var 
speech_shuffle_rate will also raise when poly is fed a cracker to help cut down on line repetition
 2016-02-14 17:46:15 -05:00
tkdrg
9e74538509 Merge pull request #15490 from octareenroon91/patch-37 
Parrot-Cracker Balance
 2016-02-14 19:41:31 -03:00
Incoming5643
431421b2f2 Take cares of minor suggested code tweaks 2016-02-14 17:17:41 -05:00
octareenroon91
610f2b47ba Now requires 20 crackers to go from 1% to 100% speak_chance. 2016-02-14 15:34:07 -06:00
tkdrg
911e1b2b21 Merge pull request #15496 from phil235/FinalBorgStunFix 
Fixes runtime when borg try to reduce its weakened var.
 2016-02-14 12:50:05 -03:00