cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-01 04:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,580 Commits 60 Branches 14 Tags
77ee2ded62a2c285ccdda4ba2fd7e64f05ef4e3e
Commit Graph

13984 Commits

Author SHA1 Message Date
AnturK
77ee2ded62 Renames click intercept method to avoid collision with ClickOn 2016-02-20 15:39:14 +01:00
tkdrg
0c55904f2a Merge pull request #15623 from Core0verload/runtime 
Fixes a spacewalking runtime
 2016-02-20 10:00:05 -03:00
tkdrg
a51c987ae2 Merge pull request #15589 from KorPhaeron/weather2 
Fixes up weather performance
 2016-02-20 09:31:12 -03:00
tkdrg
29ffc7ef16 Merge pull request #15213 from xxalpha/future 
Kinetic accelerators automatically reload.
 2016-02-20 09:06:51 -03:00
KazeEspada
e36c114ddf Fixes endless Nar-sies. 
Hopefully this fixes the endless nar-sie storm.
 2016-02-20 02:12:39 -07:00
tkdrg
78ad41b8ec Merge pull request #15052 from xxalpha/uhhhhh 
Added new event: portal storm.
 2016-02-19 21:08:16 -03:00
tkdrg
b0c10f910c Merge pull request #15611 from optimumtact/patch-1 
Improve admin bomb verb
 2016-02-19 19:47:39 -03:00
xxalpha
cdd2673b15 Lower weight, later start. 2016-02-19 22:41:12 +00:00
duncathan salt
6458b524a0 Merge pull request #15615 from ChangelingRain/nottheblob 
Blobbernauts and blob spores are now immune to blob chemicals
 2016-02-19 15:51:41 -06:00
xxalpha
1a4206c77b Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-19 18:32:07 +00:00
Cheridan
24d17307a3 Merge pull request #15587 from phil235/EffectMorphineFix 
Fixes certain reagent making you sleep/be stunned/blind for just a split second every tick
 2016-02-19 11:18:50 -06: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
tkdrg
cc2ec12488 Merge pull request #15590 from KorPhaeron/icepacks 
glorf jumpsuit
 2016-02-18 20:37:20 -03:00
Incoming5643
611248a4f8 Fixes Travis 2016-02-18 18:27:35 -05:00
oranges
b6c0aa64b6 Set bomb epicenter after chosing splosion size 
:weed:
 2016-02-19 11:32:42 +13:00
Nerd Lord
59d342af3a Blobbernauts and blob spores now have healing effects when being healed by the blob. 
Blob chemicals no longer work on blob mobs, meaning you can't hit yourself as a blobbernaut to throw things with sorium, darkmatter, or cyclonic grid.
 2016-02-18 17:11:59 -05:00
tkdrg
180bd6de79 Merge pull request #15588 from AnturK/isbuffingthisactuallygoodidea 
Fixes tesla southern tendency.
 2016-02-18 18:35:26 -03:00
tkdrg
00528835a5 Merge pull request #15561 from AnturK/tactical_chairs 
Chairs/Beds Repathing/Refactor
 2016-02-18 14:21:10 -03: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
tkdrg
11df2fa97a Merge pull request #15544 from Shadowlight213/Jobbancacherebuilding 
Fixes jobban cache not updating on jobbans and unbans
 2016-02-18 14:03:58 -03: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
309bfa0e91 Merge pull request #15418 from MMMiracles/spaceman 
Adds several templates for space ruins
 2016-02-18 01:30:13 -06:00
Cheridan
cfcecba389 Merge pull request #15575 from phil235/ReviveFix1 
Fixes mob revival
 2016-02-17 20:42:10 -06:00
Cheridan
a2ef1ad26f Merge pull request #15545 from Shadowlight213/defenderpref 
Makes wizard academy defender respect prefs
 2016-02-17 19:57:02 -06:00
Cheridan
6290022001 Merge pull request #15547 from KorPhaeron/seed_vault 
Five lavaland ruins
 2016-02-17 19:54:08 -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
KorPhaeron
28b179908f glorf 2016-02-17 16:59:56 -06:00
KorPhaeron
67aec79ecf Weather 2016-02-17 16:28:59 -06:00
AnturK
422b55d2f9 Fixes tesla southern tendency. 2016-02-17 22:52:10 +01:00
AnturK
3c8652e346 Merge pull request #15504 from phil235/HatMaskFacialHairFixes 
Fixes mask and head gear issues
 2016-02-17 21:47:17 +01:00
phil235
54b87e0239 Fixes typo in suit.dmi 
Removes action button from the paranormal response unit helmet
 2016-02-17 21:32:46 +01:00
phil235
e3ba907c58 Fixes certain reagent making you sleep/be stunned/blind for just a split second every time life() is called. 2016-02-17 21:20:39 +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
1bee6b5365 Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-17 15:04:51 +00:00
xxalpha
d0d708fa69 spawns 2016-02-17 14:37:07 +00:00
xxalpha
7c0c66dba3 Merge remote-tracking branch 'upstream/master' into urange 2016-02-17 14:21:29 +00:00
KorPhaeron
f3fd49349c Prisoner Transport 2016-02-17 06:32:32 -06: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
Cheridan
073817b0ba Merge pull request #15538 from phil235/SpawnAtomFix 
Fixes spawn_atom() runtime.
 2016-02-16 03:51:12 -06:00