cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 09:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,779 Commits 61 Branches 14 Tags
d2d9cd80cdc2a094bbc94b1f0cdec6bab8207413
Commit Graph

13055 Commits

Author SHA1 Message Date
Shadowlight213
d2d9cd80cd Removed unused defined proc in APC code. 2016-01-11 11:26:04 -08:00
Razharas
8dc7f8947c Merge pull request #14553 from lzimann/checkantagfix 
Fix Check Antagonist button not logging when accessed by player panel
 2016-01-11 09:00:03 +03:00
Razharas
e9ecce2918 Merge pull request #14514 from KorPhaeron/helmets 
Fixes hardsuit helmets being destroyed when force unequipped
 2016-01-11 08:55:19 +03:00
tkdrg
bf278539fb Merge pull request #14574 from ChangelingRain/titaniumrose 
Holoparasites are now named after silvery metals and flowers and have updated sprites
 2016-01-11 00:13:09 -03:00
Nerd Lord
93f412c497 Adds three new holoparasite colors and updates the parasite sprites to have better shading. 
Holoparasite naming is now like Titanium Rose/Gallium Ivy/Bismuth Daisy
 2016-01-10 21:53:36 -05:00
tkdrg
030cf322b4 Merge pull request #14545 from KorPhaeron/alienCD 
Adds cooldown to aliens attacking APCs
 2016-01-10 20:45:35 -03:00
Lzimann
4ab36b7c29 Fix Check Antagonist button not logging when accessed by player panel 2016-01-10 04:05:24 -02:00
Cheridan
6c9fa9eb72 Merge pull request #14389 from phil235/VisibleMessageRefactor 
Refactor the visible_message() proc to be faster in some cases.
 2016-01-09 22:16:57 -06:00
tkdrg
1d7a2c187e Merge pull request #14448 from KorPhaeron/hippies 
Fixes pAIs not being able to use messenger
 2016-01-09 21:22:41 -03:00
KorPhaeron
f24ff47eba Alien cooldown 2016-01-09 18:10:39 -06:00
tkdrg
d8f168f3da Merge pull request #14529 from AnturK/evenmorefixes 
Misc fixes
 2016-01-09 20:32:02 -03:00
tkdrg
24b7eaa23a Merge pull request #14488 from KorPhaeron/wall_layer 
Walls are a slightly higher layer than floors
 2016-01-09 18:41:59 -03:00
KorPhaeron
1d9b334e50 Fixes layers 2016-01-09 15:32:35 -06:00
AnturK
23efe5f675 Adds a variable to block shuttles from changing destinations midflight for mining shuttle 2016-01-09 17:44:16 +01:00
tkdrg
bff752a69a Merge pull request #14513 from KorPhaeron/why 
Removes teleport scroll from snowdin
 2016-01-09 12:39:23 -03:00
Tkdrg
b6d0cee2f7 Merge branch 'KorPhaeron-lava_rivers' into HEAD 
Closes #13511
 2016-01-09 12:07:34 -03:00
KorPhaeron
b96bec5157 River Generation Module 
This is going to be used for lava rivers in lavaland.
 2016-01-09 12:06:55 -03:00
Aranclanos
95df33b325 Merge pull request #14313 from tkdrg/goooof 
Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework"
 2016-01-08 20:39:16 -03:00
AnturK
bd24560cfb Fixes Hulk punches missing message. 2016-01-09 00:21:32 +01:00
tkdrg
8cb75f1c68 Merge pull request #14501 from KorPhaeron/clips 
Fixes magazine desc
 2016-01-08 18:12:52 -03:00
tkdrg
920bbeb2c4 Merge pull request #14480 from AnturK/minor 
Minor Fixes
 2016-01-08 15:13:22 -03:00
phil235
b9c3836f7b Merge pull request #14493 from KorPhaeron/monkey 
Fixes monkeys
 2016-01-08 16:49:15 +01:00
KorPhaeron
16bf636167 Helmets 2016-01-08 08:15:46 -06:00
KorPhaeron
7bafb9e1fd Snowdin 2016-01-08 07:37:57 -06:00
phil235
e5a6113157 Merge pull request #14354 from Arquebusier/eggfix 
Eggfixv2
 2016-01-08 14:31:31 +01:00
duncathan salt
0757495543 Merge pull request #14416 from AnturK/mostcriticalbug 
Fixes Ian wearing deathsquad suit
 2016-01-08 07:20:15 -06:00
duncathan salt
249bda699c Merge pull request #14428 from KorPhaeron/niknakflak 
Fixes fake nuke
 2016-01-08 07:18:03 -06:00
duncathan salt
227b3149b2 Merge pull request #14441 from SouDescolado/master 
Fixes abandoned crates minigame / Also fixes tuberculosis kit
 2016-01-08 07:16:22 -06:00
duncathan salt
7c1578a21d Merge pull request #14447 from AnturK/imbleending 
Fixes NOBLOOD species bleeding
 2016-01-08 07:15:32 -06:00
duncathan salt
6fcb78044d Merge pull request #14450 from AnturK/mechboots 
Fixes mechs using occupant spacemove
 2016-01-08 07:14:46 -06:00
duncathan salt
c594d2dfa6 Merge pull request #14462 from MMMiracles/ezpoints 
Misc Fixes
 2016-01-08 07:13:00 -06:00
duncathan salt
3da7b46732 Merge pull request #14466 from MightyRadcon/master 
Fixes simple bots broadcasting department radios
 2016-01-08 07:11:02 -06:00
duncathan salt
a1d0b96396 Merge pull request #14475 from bgobandit/fixtres 
Slung improvised shotgun now properly updates its sprite.
 2016-01-08 07:09:58 -06:00
Tkdrg
5589ac7559 Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework" 
This reverts commit 52a45b6292, reversing
changes made to 19b43ba668.

Conflicts:
	code/datums/mind.dm
 2016-01-07 23:15:35 -03:00
tkdrg
bc8e46b8a3 Merge pull request #14440 from MrStonedOne/patch-119 
Fixes map loader not initializing map edited path/type vars
 2016-01-07 20:28:56 -03:00
tkdrg
2b3da6ffc7 Merge pull request #14455 from KorPhaeron/revive 
Revive now removes hallucination
 2016-01-07 20:03:33 -03:00
tkdrg
a065241a69 Merge pull request #14444 from xxalpha/fixrecursiveab 
Fix recursive action buttons
 2016-01-07 19:54:33 -03:00
KorPhaeron
a960dcf5e6 Clip descriptions 2016-01-07 16:08:02 -06:00
KorPhaeron
407960a358 Copypasted wrong 2016-01-07 14:46:12 -06:00
KorPhaeron
7d332e869c Fixes monkeys 2016-01-07 14:41:55 -06:00
KorPhaeron
224c5d1029 Use defines 2016-01-07 13:10:12 -06:00
KorPhaeron
c93fcdb5dc Wall layer 2016-01-07 13:02:36 -06:00
Razharas
d80a487ac0 Merge pull request #14438 from KorPhaeron/spacevine 
Fixes being able to attack vine controllers
 2016-01-07 18:26:50 +03:00
AnturK
6fbb930d2b Removes the annoying autorefresh in mulebots. 2016-01-07 15:04:12 +01:00
AnturK
51086a14b4 Fixes revive breaking bot icon 2016-01-07 14:55:12 +01:00
bgobandit
8aa51b79ec Slung improvised shotgun now properly updates its sprite. 2016-01-07 07:55:59 -05:00
tkdrg
8cbb8f7195 Merge pull request #14427 from ChangelingRain/clampedlife 
Clamp()s in living damage procs
 2016-01-07 02:11:01 -03:00
duncathan salt
18b9d67ab5 Merge pull request #14364 from swankcookie/cockroach_guts_fix 
Cockroach guts fix
 2016-01-06 22:50:15 -06:00
MightyRadcon
c89007f1f7 Fixes simple bots broadcasting department radios 
Started with #13471 but all simple bots (medbots, floorbots, etc.) had this problem.
 2016-01-06 20:27:09 -08:00
swankcookie
d4c3048a31 Removes redundant anchor tags 
Signed-off-by: swankcookie <__X__>
 2016-01-06 22:08:17 -06:00