cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-23 23:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,811 Commits 61 Branches 14 Tags
2497b48b0de014641dfdc6c4635eda95a79ff56f
Commit Graph

6340 Commits

Author SHA1 Message Date
Cheridan
722252e7bb Merge pull request #15739 from CosmicScientist/fixes_armour_penetration 
Prevents armour from absorbing penetration
 2016-02-26 12:39:35 -06:00
Cheridan
2d9619446f Merge pull request #15733 from phil235/ClosetAIFix 
The AI's core no longer fits inside regular closets
 2016-02-26 08:37:57 -06:00
AnturK
a73fcf5414 Merge pull request #15717 from KazeEspada/Plasamemeforrealz 
Humans and monkeys now breath all of the gas in their breath.
 2016-02-25 23:10:56 +01:00
Joan Lung
80c9101892 Merge pull request #15661 from AndrewJacksonThe2nd/PARANOIA 
A TEAM OF NUKEOPS DISGUISED AS THE HEADS OF STAFF
 2016-02-24 23:25:17 -05:00
CosmicScientist
4c34677a6b debuffs feel good factor, buffs my sanity 2016-02-25 00:34:24 +00:00
phil235
3ea7cf9831 The AI's core no longer fits inside regular closets (but still fits inside bluespace bodybag). 
Ghosts and camera mobs no longer get inserted inside closets.
Fixes an error in alien nest code.
 2016-02-24 22:56:54 +01:00
AnturK
978a18d476 Merge pull request #15699 from KazeEspada/cockroachpushing 
Tiny mobs can't push shit.
 2016-02-24 14:26:16 +01:00
AnturK
2dca4811b6 Merge pull request #15686 from Menshin/bot_patrol_fixes 
Bots patrol/summons tweaks and fixes
 2016-02-24 14:11:09 +01:00
AndrewJacksonThe2nd
38f3f1dada Merge branch 'master' of https://github.com/tgstation/-tg-station into PARANOIA 
Conflicts:
	code/game/objects/items.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/under/chameleon.dm
 2016-02-23 21:06:36 -08:00
KazeEspada
f44a2ca210 Fixes Plasmamemes for realsies. Monkeys and Humans now breath all of their breath as long as they can process that gas. 2016-02-23 21:54:42 -07:00
Remie Richards
4d1e3764e1 Merge pull request #15673 from phil235/ActionButtonUpdateRefactor 
Action buttons will now only update when needed instead of every Life().
 2016-02-24 02:01:15 +00:00
KazeEspada
ff45d89eac Fixes Plasmameme and breathed gases no longer go to turfs. 2016-02-23 16:18:41 -07:00
Razharas
746bbcf4ce Merge pull request #15696 from Robustin/MuhYakuzaEroticFantasy 
Traitors can buy former Sleeping Carp Scroll for 17TC
 2016-02-24 02:04:24 +03:00
tkdrg
377f187d53 Merge pull request #15691 from phil235/CigaretteMsgFix 
Fixes a mistake in visible_message() code. Turf calling visible_messa…
 2016-02-23 18:48:55 -03:00
phil235
57203430fd Merge branch 'master' of https://github.com/tgstation/-tg-station into ActionButtonUpdateRefactor 
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/mob/living/carbon/inventory.dm
	code/modules/mob/living/carbon/life.dm
	icons/mob/actions.dmi
 2016-02-23 19:49:38 +01:00
phil235
0ec876d9fe Refactored the item's action system. Items can now hold multiple actions. 
The "set internals" button of tank items now turn green when it's used as internals.
Removed research scanner from drones (since cyborgs don't have it, it's more consistent)
Removed the ignore_madkadjust mask var.
The sechailer mask now has an adjust mask action button, so I removed the adjust verb that it was using.
The item's action are now created on item/New() instead of trying to create it every time someone picks the item up.
I split hud/action.dm, the datum/action stuff is now in the datum folder (/datum/action.dm), whereas the code for action buttons is kept in the hud folder under action_button.dm. Also I moved some /datum/action code that was in some files back into datum/action.dm where it belongs.
 2016-02-23 19:37:42 +01:00
KazeEspada
c130d04dfc Tiny mobs can't push shit. 2016-02-22 18:51:46 -07:00
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
KorPhaeron
b56b079ef9 Merge pull request #15669 from AnturK/hivelordcore 
Fixes hivelord core healing
 2016-02-22 13:56:28 -06:00
phil235
c424dfbcf9 Fixes a mistake in visible_message() code. Turf calling visible_message() now work correctly. 
Fixes lighting cigarette message not appearing.
 2016-02-22 20:46:19 +01:00
Robustin
320b1e958c Update mob_helpers.dm 2016-02-22 13:24:08 -05:00
Menshin
5533b54a0e * Cleaned bot patrol/summon logic regarding pathing retries 
* Splitted navbeacons global list in several z_level lists
* Fixes navbeacons and deliverybeacons global lists being erased when a navigation beacon was destroyed
 2016-02-22 17:56:34 +01:00
Cheridan
c1f17f6cbf Merge pull request #15662 from tkdrg/ILOVETOPIC 
Sanitizes a bunch of num inputs to be integers
 2016-02-22 10:32:15 -06: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
AndrewJacksonThe2nd
583c2c3dea Fixes 2016-02-21 15:46:16 -08:00
phil235
91839f5f70 Action buttons will now only update when needed instead of every Life(). 
The action buttons now update their icon instantly.
Fixes versions of pickup(),equipped() and dropped not calling the parent.
Fixes drone not being able to remove a defib from their storage.
You can now cycle the mime mask by clicking it in your hand.
The action buttons for hardsuit and hooded suits now only appears when you're wearing the suit.
Created two mob helper procs getBeltSlot() and getBackSlot().
Created /datum/species/proc/on_species_loss() to handle stuff when our race change, currently only used by jelly and slime race to remove their exotic blood from our reagents and to remove slime people's action buttons.
 2016-02-22 00:34:59 +01:00
AnturK
3e067441cd Fixes hivelord core healing 2016-02-21 20:46:29 +01:00
Tkdrg
c8c0f5294f Sanitizes a bunch of num inputs to be integers 
This is mostly to plug href exploits causing wacky stuff like NaN.
 2016-02-21 12:15:37 -03:00
AndrewJacksonThe2nd
5d5d2427f4 temp 2016-02-20 22:12:25 -08: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