cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 08:34:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,808 Commits 61 Branches 14 Tags
a88f4987017b61a4dbbfe6d00febd4dffdc2a771
Commit Graph

1924 Commits

Author SHA1 Message Date
Joan Lung
d1e90e4dc6 Merge pull request #16915 from coiax/holodeck-chairs 
Wooden holodeck chairs can no longer be picked up
 2016-04-17 11:56:29 -04:00
Jack Edge
336612f663 You can't pick up NODECONSTRUCTed chairs 2016-04-17 14:39:42 +01:00
nullbear
1cb85c3024 Fixes monkey cube Dupe Glitch 
fixes https://github.com/tgstation/-tg-station/issues/14667

Adds some consistency, allowing monkeys to be drag dropped onto the
monkey recycler, like they are with the disposals chutes.

Prevents grabs from being placed in disposals, as they were being
before.
 2016-04-15 21:36:34 -07:00
c0
04f1aafa78 Exports 2016-04-13 06:01:40 +03:00
KorPhaeron
eb78787083 Throwing 2016-04-08 23:18:46 -05:00
Cheridan
e6e4ee9998 Merge pull request #16725 from PKPenguin321/patch-9 
fixes magic extinguisher cabinets
 2016-04-08 17:53:54 -05:00
KorPhaeron
82786783f4 Merge pull request #16716 from coiax/plant-genes 
Added a "plant DNA manipulator" to Botany backroom
 2016-04-08 16:34:34 -05:00
Jack Edge
d362a2f5e5 Added plant gene disks to secure botany lockers 
The Botany plant DNA machine isn't useful without the diskettes. So here
they are.
 2016-04-08 10:22:46 +01:00
KorPhaeron
7809e4dc79 Merge pull request #16692 from Core0verload/cargo-improvements 
New Engineering Crates, Shuttle Loan fix
 2016-04-07 21:28:29 -05:00
PKPenguin321
d1d9111fe0 fixes copypasted varnames 
i am a scum coder who dual mains ctrl+c and ctrl+v
 2016-04-07 15:21:42 -07:00
PKPenguin321
00315cff35 fixes magic extinguisher cabinets 
spirits begone
 2016-04-07 15:19:26 -07:00
Razharas
a8890b264a Merge pull request #16563 from lzimann/lockerfix 
Fix a bug with stuffing people into lockers.
 2016-04-08 00:00:22 +03:00
KorPhaeron
b5b523f7f0 Black Bedsheets 2016-04-07 14:42:26 -05:00
c0
43798574f6 Engineering Crates 2016-04-07 03:26:18 +03:00
oranges
aed000580c Keep pixely layout when changing sign type 
This stops signs realigning to your turf when you go to change the sign
type.

Also slight sanity check for adjacency after user uses pen
 2016-04-06 14:02:47 +12:00
Cheridan
90cb067020 Merge pull request #16621 from duncathan/atmosspawnair 
Makes atmos_spawn_air() use the new gas string parser
 2016-04-05 11:38:12 -05:00
KorPhaeron
9e77efb176 Merge pull request #16610 from PKPenguin321/patch-9 
fixes a godawful message
 2016-04-04 20:52:51 -05:00
Cheridan
866c418f78 Merge pull request #16592 from bgobandit/ocd 
Alt-clicking a fire extinguisher cabinet opens/closes it.
 2016-04-04 17:43:37 -05:00
duncathan
497a4efc70 makes atmos_spawn_air() use the new gas string parser 2016-04-04 01:49:09 -06:00
PKPenguin321
d098b2594f you cant hide from me you little shit 2016-04-03 18:57:32 -07:00
PKPenguin321
dbcb729f2a fixes a godawful message 
jesus christ who wrote this garbage
 2016-04-03 18:56:14 -07: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
bgobandit
6e52bef680 Alt-clicking a fire extinguisher cabinet opens/closes it. 2016-04-03 07:11:53 -04: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
Lzimann
cb867fe314 Adds a new proc so multiple atoms can be watched for movement 2016-04-02 16:33:56 -03:00
Lzimann
b587496058 Fix locker stuffing 2016-04-02 00:02:50 -03:00
Joan Lung
82350431b2 Merge pull request #16439 from KorPhaeron/mecha2 
Mining Gear Balance
 2016-03-31 22:10:07 -04:00
Cheridan
97877c0b2f Merge pull request #16487 from Supermichael777/BZZZZT 
Makes Grills ZAP things when shit gets tossed at them.
 2016-03-31 01:42:58 -05:00
Supermichael777
b525ae0273 I cannot into code too deep 2016-03-30 00:14:14 -04:00
Supermichael777
1d3e9b1817 thanks to remie for reminding me to check things 2016-03-30 00:00:11 -04:00
Supermichael777
22f42d497a oooopps 2016-03-29 23:51:18 -04:00
Supermichael777
11e0a04f78 BZZZZT 2016-03-29 23:44:52 -04: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
KorPhaeron
53fac5b31d Ruins mining 2016-03-29 03:09:59 -05:00
Xhuis
32ef4ffe0a Optimizations, statue changes 2016-03-26 21:24:10 -04:00
Xhuis
cc62b89baf Fix bundle 2016-03-26 15:15:31 -04:00
Cheridan
c6ab8b0041 Merge pull request #16165 from ChangelingRain/cultlock 
Nar-Sie will now corrupt airlocks, tables, windows, and windoors
 2016-03-19 21:58:12 -05:00
Cheridan
5823fda099 Merge pull request #16145 from Incoming5643/girder_your_loins 
Deinforces reinforced girders
 2016-03-17 17:36:10 -05:00
Nerd Lord
f7a2348ef7 Nar-Sie will now corrupt doors, tables, windows, and windoors 2016-03-17 16:28:26 -04:00
Incoming
76972d385a The reenforced girders ex_act values have been boosted. They were previously harder to destroy with low level explosions than the R-walls they're built into 
R-Wall
ex_act(1): 100% ripped to space
(2): 50% replaced with r-girder else ripped to plating
(3): 10% replaced with r-girder

Old R-girder
ex_act(1): 100% destroyed
(2): 30% destroyed
(3): 5% destroyed

New R-grider
ex_act(1): 100% destroyed
(2): 50% destroyed
(3): 20% destroyed
 2016-03-16 18:40:57 -04:00
Cheridan
0288f7c592 Merge pull request #16067 from xxalpha/silky_smooth 
icon smooth ss
 2016-03-15 04:59:48 -05:00
xxalpha
688137c7dc icon smooth ss 
adjustments

adjustements

atharrachaidhean
 2016-03-12 23:57:45 +00:00
AnturK
8701541d20 Fixes not being able to unbuckle from surgery tables 2016-03-12 21:44:45 +01:00
c0
f3ecb132ba Adds Alien Alloys 2016-03-12 15:06:03 +03:00
KorPhaeron
5420596dd0 Merge pull request #15819 from xxalpha/october_12th_2555 
Detective can be a traitor/double agent.
 2016-03-11 12:50:32 -06: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