cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-13 18:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,164 Commits 62 Branches 14 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

321 Commits

Author SHA1 Message Date
AnturK
ae9e56d21f Merge pull request #15852 from KazeEspada/Cabin 
Cabin Away Mission
 2016-03-03 22:18:12 +01:00
KazeEspada
6d2a95eb43 Moves the mapGenerator to mapGeneratorObj.dm. 
Cabin was given new carpets, and some fixes.

The snowy map generator now spawns bunnies.

New type of bunny that is not easter related.

Chickens now have support for no eggs.
 2016-03-03 13:47:11 -07:00
KazeEspada
7bfe258241 Cabin ready for testing commit. Cabin is mostly finished and just needs some eyes to look over it and see if I missed anything. 2016-02-29 22:47:38 -07:00
tkdrg
c02ccab8c0 Merge pull request #15758 from AnturK/spawners 
Refactor of map and corpse spawners.
 2016-02-29 23:44:38 -03:00
KazeEspada
f1d903dadb Add fireplace and a map generator. Finishes more the cabin map. 2016-02-28 14:18:08 -07:00
KazeEspada
03c168c2b3 Begins work on Cabin away mission. Its a quiet away mission that resembles beach. 2016-02-27 17:36:09 -07:00
Cheridan
2dfebaa77e Merge pull request #15708 from KorPhaeron/sins 
Five lavaland ruins
 2016-02-26 08:46:32 -06:00
tkdrg
45fca87806 Merge pull request #15687 from AnturK/template_improvements 
Template loading improvements
 2016-02-25 16:29:10 -03:00
AnturK
e045382022 Neater order. 2016-02-25 18:53:58 +01:00
AnturK
5edc60ed0a Unifies corpse spawners 2016-02-25 18:36:16 +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
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
Cheridan
2901f3d8f0 Merge pull request #15684 from KorPhaeron/snowdin 
Removes die of fate from snowdin
 2016-02-23 01:48:03 -06:00
KorPhaeron
d17d34edc9 Three lavaland ruins 2016-02-23 01:07:06 -06:00
AnturK
4e0db5664b Adds /turf/template_noop and /area/template_noop to dmm reader 2016-02-22 19:24:45 +01:00
KorPhaeron
72c4becd95 Removes die of fate from snowdin 2016-02-21 23:25:04 -06: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
AndrewJacksonThe2nd
5d5d2427f4 temp 2016-02-20 22:12:25 -08:00
Buggy123
18d24dc2b8 Fixed syntax 2016-02-20 00:54:04 -05:00
Buggy123
cc5f1b2179 Dice of fate is now reusable 2016-02-20 00:48:47 -05: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
KorPhaeron
f3fd49349c Prisoner Transport 2016-02-17 06:32:32 -06: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
Shadowlight213
b46b11d75d Makes wizard academy defender respect prefs 2016-02-14 23:03:22 -08:00
MMMiracles
e10fe56f6c adds 11 templates for space ruins 2016-02-10 21:32:40 -05:00
tkdrg
2547e8dc32 Merge pull request #15300 from Buggy123/patch-16 
Makes the explosion size of BS artillery a configurable variable
 2016-02-10 13:18:05 -03:00
AnturK
d9a8268fce Makes preloader not gc needlessly 2016-02-09 17:35:48 +01:00
Buggy123
a2b0d47250 Makes explosion of BS artillery configurable 2016-02-07 22:32:38 -05:00
KorPhaeron
37c0b23483 New CTF gear 2016-02-06 19:38:47 -06:00
KorPhaeron
9f659fd0d0 Adds an easy way for admins to enable instagib mode 2016-02-06 08:55:59 -06:00
KorPhaeron
6cef32be12 Adds instagib mode to CTF 2016-02-06 07:11:51 -06:00
Bjorn Neergaard
063dd9fb84 Get the code running on 510 
* Travis for 510
* Remove json, list2text, text2list, bygex
* Change blind and click catcher to a low plane
 2016-02-04 17:19:40 -06:00
KorPhaeron
0f39a20d4a Machines are apparently not anchored by default 2016-02-01 22:40:22 -06:00
KorPhaeron
07ca64fdbb King of the Hill Fixes 2016-02-01 22:11:46 -06:00
tkdrg
0d3e68c1d0 Merge pull request #15099 from PKPenguin321/patch-12 
Dice of Fate -> Die of Fate
 2016-01-31 22:20:05 -03:00
tkdrg
faa81107d6 Merge pull request #15079 from KorPhaeron/ctf_bugfix 
CTF bugfixes and control point
 2016-01-31 21:23:52 -03:00
KorPhaeron
b56879d21e Parentheses 2016-01-31 18:16:05 -06:00
KorPhaeron
aed4a51223 Restores factions to being lists 2016-01-31 17:46:01 -06:00
tkdrg
9d8275e6e8 Merge pull request #15078 from KorPhaeron/space_suit 
Removes inhand slowdown from space suits
 2016-01-31 13:58:48 -03:00
tkdrg
7891ac2805 Merge pull request #15034 from AnturK/shuttle_templates 
Adds map template datum and size preloading
 2016-01-31 13:33:30 -03:00
KorPhaeron
afc0e1e4c6 Capture the Flag fixes and control point 2016-01-31 04:20:35 -06:00
PKPenguin321
5854c87ce5 removes the letter c 
dice -> die
 2016-01-30 18:38:35 -08:00
KorPhaeron
eedd50ac33 Fixes flag duping 2016-01-30 04:51:12 -06:00
KorPhaeron
efb91fb10a Handslow 2016-01-30 04:30:55 -06:00
tkdrg
d3765adbe0 Merge pull request #14988 from KorPhaeron/ctf 
Shuffles CTF check order
 2016-01-29 21:58:40 -03:00
AnturK
8999db80b4 Fixes shuttles loading improperly in templates 
Adds template datum and preloader
 2016-01-29 20:51:12 +01:00
Razharas
0826128459 Merge pull request #14698 from Firecage/absolutepathsandifs 
Absolute paths and changes one liner if's/else's/else if's.
 2016-01-29 03:15:12 +03:00
KorPhaeron
7b2dc3fe73 Shuffles check order 2016-01-27 19:13:21 -06:00