cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 00:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,527 Commits 61 Branches 14 Tags
7c293f0aa63d00a3fdb43262c06ccb93b8e0a040
Commit Graph

331 Commits

Author SHA1 Message Date
c0
44c1917de2 One symbol fix 2016-04-29 13:48:36 +03:00
TechnoAlchemist
e2a6dac71f Merge branch 'master' of https://github.com/tgstation/-tg-station into realkinkystuff 
fixes conflicts probably

# Conflicts:
#	icons/obj/items.dmi
 2016-04-28 12:03:31 -07:00
Joan Lung
fd8942e70c Adds survival pod windows to the code 
* Adds survival pod windows to the code

* Light and dark pod flooring

* looks better
 2016-04-28 10:57:39 -06:00
Joan Lung
cc59925d2e Merge pull request #17108 from Bawhoppen/sandbagsz 
Some sandbag changes
 2016-04-27 20:23:21 -04:00
TechnoAlchemist
926e351fee adds sinew restraints, changes sinew droprate. 2016-04-26 14:10:42 -07:00
phil235
6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction 
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
 2016-04-26 21:49:51 +02:00
duncathan salt
0f0aa25976 fixes watcher sinew origin tech 2016-04-25 23:44:06 -06:00
phil235
bb1f60e769 Fixes typos and errors I made. 
Fixes unscrewing a broken computer only dropping one glass shard instead of two.
Fixes AI holopad, recharger, keycard authentication device, reagent_dispensers reagentgrinder, and APC  not being attackable.
Fixes APC cover knockdown being random, it now uses the take_damage() proc, which also allows animals and xenos to knock down the cover of a broken apc.
 2016-04-25 22:29:17 +02:00
Lularian
322fc535ad sandbags rah rah rah 2016-04-25 05:04:11 -05:00
TechnoAlchemist
556f611278 makes the path /animalhide 2016-04-24 22:07:51 -07:00
TechnoAlchemist
581a13975b makes goliath plates stackable. 2016-04-24 21:27:48 -07:00
phil235
fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction 
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
 2016-04-24 21:22:37 +02:00
phil235
0caa59b21a First commit of this big PR 
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
 2016-04-24 20:26:24 +02:00
TechnoAlchemist
7b79508b17 bone ore and path REFACTOR. 2016-04-21 15:36:27 -07:00
TechnoAlchemist
e61fba82ea Adds Bones and sinew to butchering results. Adds bone armor. 2016-04-21 12:58:15 -07:00
Nerd Lord
30c5fc412c Floor tiles have slightly random placement 2016-04-19 23:28:49 -04:00
Cheridan
d671bf573c Merge pull request #16858 from nullbear/Chemical-Explosives 
Adds Chemical Explosives
 2016-04-18 02:35:56 -05:00
RandomMarine
76212a5fb9 Implements cloth stacks 2016-04-16 12:56:37 -07:00
RandomMarine
82e39d6a85 Implements cloth stacks 2016-04-16 11:11:16 -07:00
nullbear
df32979866 Adds Chemical Explosives 
see changelog for details
 2016-04-13 13:09:41 -07:00
AnturK
4b7f274e3f Merge pull request #16742 from Core0verload/master 
Cargo Exports (and a very basic economy system)
 2016-04-13 17:41:05 +02:00
c0
04f1aafa78 Exports 2016-04-13 06:01:40 +03:00
erwgd
dbae4b78e0 2 planks are needed to craft rolling pin 2016-04-11 22:41:03 +01:00
erwgd
249a81dd15 Update sheet_types.dm 
changed planks required from 10 to 1 to make rolling pin
 2016-04-11 22:37:46 +01:00
erwgd
b2eea7769f Added rolling pin recipe datum to wooden plank 2016-04-11 21:40:44 +01:00
Jack Edge
870208e7e4 Made ore boxes cost 4 wood instead of 20 2016-04-09 15:53:38 +01:00
Jack Edge
07aafedcac Added making ore boxes out of 20 wood planks 
Did you know ore boxes were made of wood? It's in the description
for them and everything.
 2016-04-08 15:45:03 +01:00
duncathan
497a4efc70 makes atmos_spawn_air() use the new gas string parser 2016-04-04 01:49:09 -06:00
duncathan
a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs 
Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm
 2016-04-03 18:22:20 -06:00
bawhoppen
af51a66e37 Adds sandbags 
* sandbgs an stuff

* mmmm

* fucking sandbags

* okokok

* aaaaaaaaaaaaaaaaaaaaaah
 2016-04-02 23:52:12 -04:00
Joan Lung
c3f4f4f9f8 Nar-Sie will now convert girders to cult girders and metal sheets to runed metal sheets 
* Nar-Sie will now convert girders to cult girders and metal sheets to runed metal sheets

* qdel(qdel())
 2016-04-03 13:41:45 +10:00
duncathan
e86cf0f280 praise the good lord, for the game finally compiles 2016-03-29 19:04:37 -06:00
duncathan
3f1375ba39 Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs 
Conflicts:
	_maps/RandomZLevels/Cabin.dmm
	_maps/RandomZLevels/beach2.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
	_maps/map_files/MetaStation/MetaStation.v41I.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	_maps/map_files/generic/z4.dmm
	_maps/templates/lavaland_surface_automated_trade_outpost.dmm
	_maps/templates/lavaland_surface_biodome_winter.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	code/controllers/subsystem/air.dm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/effects/aliens.dm
	code/game/objects/effects/overlays.dm
	code/game/objects/items/apc_frame.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/girders.dm
	code/game/turfs/simulated.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/mineral_floor.dm
	code/game/turfs/simulated/floor/plating.dm
	code/game/turfs/simulated/river.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/simulated/walls_reinforced.dm
	code/modules/admin/verbs/buildmode.dm
	code/modules/atmospherics/environmental/LINDA_turf_tile.dm
	code/modules/events/spacevine.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/holodeck/turfs.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/interactive.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/bot/floorbot.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/mob/mob_movement.dm
	code/modules/power/singularity/narsie.dm
	code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
	code/modules/research/server.dm
 2016-03-29 14:46:06 -06:00
duncathan
b9950c4358 turf/open and turf/closed 2016-03-29 13:38:56 -06:00
Remie Richards
17defb66d4 Bee fixes and updates! 
* Added the ability to make Apiaries and Honey frames with wood
* Added the ability to make Royal Bee Jelly from 10 Mutagen and 40 Honey
* Added the ability to make more Queen Bees from Royal Bee Jelly by using it on an existing Queen, to split her into two Queens
* Made homeless bees more obvious
* Fixed a typo that made almost all bees homeless, severely reducing the odds of getting honeycomb
* Made bee progress reports (50% towards new honeycomb, etc.) always show, even if it's 0%
* Made some feedback text more obvious
* Fixed being able to duplicate the bee holder object, this was not exploity, just weird
* Fixed being able to put two (or more) queens in the same apiary
* Fixed some runtimes from hydro code assuming a plant gene exists
* Fixed runtime when you use a honeycomb in your hand
* It now takes and uses 5u of a reagent to give a bee that reagent
* Removed unused icon file
 2016-03-27 21:07:53 +01:00
Cheridan
eeeff80e5f Merge pull request #16366 from Xhuis/the_forbidden_art_of_fixing_issues 
Fix bundle
 2016-03-26 21:06:00 -05:00
Xhuis
cc62b89baf Fix bundle 2016-03-26 15:15:31 -04:00
Lularian
aa5923dd39 medical stuff 2016-03-25 13:06:37 -05:00
Cheridan
454af7cb2d Merge pull request #16197 from KorPhaeron/crates 
Adds abandoned crates to lavaland (sort of)
 2016-03-19 21:29:18 -05:00
KorPhaeron
ab263f6d90 Abandoned Crates 2016-03-18 20:54:20 -05:00
phil235
1054e5156e No more putting the wrapped object into the mob's hand if they're using the packagewrap via telekinesis. 
Also no fingerprints of the user added to the package and item if used with telekinesis.
 2016-03-18 00:25:18 +01:00
Razharas
b81c54b335 Merge pull request #16078 from PKPenguin321/scoot-scoot-thats-the-sound-of-the-police 
Adds scooters and skateboards
 2016-03-15 05:11:47 +03:00
PKPenguin321
bceca977ec adds scooters and skateboards 
adds scooter.dm for pretty much all scooter-and-skateboard related code
added ability to make a scooter frame to rods.dm
added sprites for the scooter, the skateboard, and the scooter frame to vehicles.dmi
 2016-03-12 19:27:48 -08:00
c0
8dfef3b793 fix 2016-03-12 15:07:33 +03:00
c0
9a3276c784 Alien Alloys in RnD 2016-03-12 15:07:32 +03:00
c0
f3ecb132ba Adds Alien Alloys 2016-03-12 15:06:03 +03:00
duncathan
12a6205372 Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs 
Conflicts:
	_maps/RandomRuins/SpaceRuins/asteroid4.dmm
	_maps/RandomRuins/SpaceRuins/spacebar.dmm
	_maps/RandomZLevels/Academy.dmm
	_maps/RandomZLevels/beach.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/spacebattle.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/RandomZLevels/wildwest.dmm
	_maps/map_files/AsteroidStation/AsteroidStation.dmm
	_maps/map_files/BirdStation/BirdStation.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/DreamStation/z5.dmm
	_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
	_maps/map_files/MetaStation/MetaStation.v41I.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	_maps/map_files/generic/z4.dmm
	_maps/map_files/generic/z5.dmm
	_maps/map_files/generic/z6.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	_maps/templates/lavaland_surface_ufo_crash.dmm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/structures/lattice.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/misc_floor.dm
	code/game/turfs/simulated/floor/plasteel_floor.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/mulebot.dm
	code/modules/mob/mob_movement.dm
 2016-03-10 23:07:21 -06:00
duncathan
5bf31463da removes simulated turfs; adds space gas mixture for space 2016-03-10 17:27:01 -06:00
phil235
44eb9607e0 Some adjustments to wrapping code. I removed my possibility to wrap non-box storage item (that was at the expense of seeing a warning message that the packagewrap doesn't fit in the storage item every time you wrap one). So we're back to only wrapping boxes. 
You can now wrap an item that is in your hand, and wrapping an item puts the created package in you hand.
Also, opening a package puts the item in your hand instead of being dropped on the ground.
 2016-03-04 17:24:36 +01:00
phil235
a330cafea5 Fixes some mistakes. 
Updating the package wrap's descriptions to be accurate and useful.
 2016-03-03 21:02:03 +01:00