cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 17:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,710 Commits 61 Branches 14 Tags
7041877ebdfd6600a563b176374a2ad925edee52
Commit Graph

162 Commits

Author SHA1 Message Date
phil235
219639e00b Using a multitool on telepad with open panel to save data no longer hits the machine. 
Packagewrapping a pulled item now properly stops the pulling.
Using put_in_hands() procs now properly checks if the mob has a hand.
bodyparts icon_state is now "" like it should be.
You can no longer build a firelock on top of another firelock.
You can reinforce a firelock assembly to build a heavy firlock.
Human species who breath something other than oxygen now get the proper alert when in crit, and I fixed the alert not being removed when healed.
 2016-06-09 20:46:00 +02:00
oranges
d360479227 Merge pull request #17934 from coiax/bluespace-shelter-templates 
Bluespace shelters use map templates
 2016-06-07 13:43:59 +12:00
Jack Edge
a9b43f06bf Bluespace shelters use templates 
🆑 coiax
rscdel: Bluespace shelter capsules can no longer be used on shuttles.
rscadd: Bluespace shelters may have different capsules stored. View what
your capsule has inside by examining it.
/🆑
 2016-06-07 02:11:35 +01:00
MMMiracles
5833990acb whew 2016-06-04 23:16:02 -04:00
MMMiracles
f7dd4495dd adds compact pickaxes to make pickaxes less non-relevant for miners 2016-06-04 23:12:06 -04:00
LatD
d89eb178c6 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-30 18:33:55 +03:00
Cheridan
e687795914 Merge pull request #17959 from blobbernaut/capsulefix 
Prevents bluespace capsules from breaking the escape shuttle
 2016-05-27 17:46:51 -05:00
LatD
65a0027979 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-28 01:37:55 +03:00
Joan Lung
2cfb2d8eed Layers are now defines (#17949) 
* Layers are now defines

* this looks better

* GAS_phil_LAYER

* no message

* remove the three unneeded defines

* no message
 2016-05-27 22:16:21 +02:00
blobbernaut
c214909b7c actually this is cleaner 
removes some useless redefinitions
 2016-05-26 18:26:31 -04:00
LatD
907fc36e5c Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-24 22:17:44 +03:00
blobbernaut
427bff2243 prevents capsules from breaching escape shuttle 2016-05-23 02:14:20 -04:00
LatD
7d6b3e6847 origin and req lvl changes 2016-05-21 17:17:20 +03:00
LatD
fe76e64641 Origin tech changes and some fixes 2016-05-17 20:57:01 +03:00
MMMiracles
eb58b393cc conflicts + ruin system 2016-05-08 19:54:57 -04:00
Core0verload
a66c2f4418 Machine/computer boards and frames refactor (#17300) 
* Map Changes

* Machine/console boards and frames refactor

* More board changes
 2016-05-08 12:11:18 +02:00
MMMiracles
b967ae25c6 spooky pod 2016-04-30 11:07:00 -04:00
Zuvassin
1f0690ca02 Fixes issues with survival pod GPS and Fans not able to be deconstructed 2016-04-29 03:23:51 +10: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
bawhoppen
fa7158e860 fixed it 2016-04-27 04:35:59 -05:00
bawhoppen
deef852516 phil's suggestion 2016-04-26 05:06:01 -05:00
Lularian
322fc535ad sandbags rah rah rah 2016-04-25 05:04:11 -05:00
Razharas
4999dee630 Merge pull request #17040 from ChangelingRain/tinyfan 
Adds a tiny fan to the survival pod!!!
 2016-04-23 02:29:01 +03:00
Nerd Lord
476772f825 " 2016-04-21 17:58:02 -04:00
Nerd Lord
a6c39e474b Adds a tiny fan to the survival pod 2016-04-21 17:46:29 -04:00
KorPhaeron
ff7ef14b87 Capsule 2016-04-18 14:47:48 -05:00
octareenroon91
5b6680d905 Pickaxes - but not drills - can now be equipped to the back. I copied the sprite for spears for visibility when worn on the back. 2016-04-10 19:30:29 -05:00
KorPhaeron
05e72de3f1 Merge pull request #16727 from ChangelingRain/mineate 
You can no longer drop survival capsules on top of dense objects
 2016-04-08 13:36:29 -05:00
Nerd Lord
5f955ad012 50% increase 2016-04-08 10:51:51 -04:00
KorPhaeron
3478183cd8 Merge pull request #16624 from TechnoAlchemisto/Better_pickaxes 
Makes pickaxe upgrades less horrible and irrelevant.
 2016-04-08 01:29:34 -05:00
Nerd Lord
ae22f792c2 fuck this in particular 2016-04-07 20:30:33 -04:00
Nerd Lord
46f0dd8734 you can no longer drop survival capsules on top of dense objects, like windows 2016-04-07 19:13:20 -04:00
KorPhaeron
b5b523f7f0 Black Bedsheets 2016-04-07 14:42:26 -05:00
KorPhaeron
166cb54a60 Fixes for survival pod, GPS toggling 2016-04-07 11:49:50 -05:00
KorPhaeron
2c091aee80 Various Mining Pod Fixes 2016-04-06 17:25:18 -05:00
KorPhaeron
f743754ec3 Survival Pod 2016-04-06 15:36:53 -05:00
TechnoAlchemist
d4f6c01b1c Line Spacing 2016-04-04 16:35:25 -07:00
TechnoAlchemist
fd361c1862 Makes pickaxe upgrades less horrible and irrelevant. 2016-04-04 01:52:20 -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
Isratosh
fa122fe793 Adding admin logs to bluespace shelter capsules. 
* Adding admin logs to bluespace shelter capsules.

* Only logs when not on mining or lavaland z level
 2016-04-02 02:42:18 -06:00
KorPhaeron
f2d5345093 Mesons 2016-03-31 17:02:50 -05: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
KorPhaeron
ffb0aa5655 AND AGAIN 2016-03-26 04:01:40 -05:00
KorPhaeron
db823713ae Fixes loop 2016-03-16 13:31:18 -05:00
KorPhaeron
063db968fa Fix 2016-03-15 23:14:47 -05:00
MrStonedOne
09fb8c2b10 Explosions and singulo use spiral range (and other changes) 2016-03-15 03:39:41 -07:00