Commit Graph

55 Commits

Author SHA1 Message Date
NikNakFlak
b43ac4eb9c whoops 2016-08-22 15:25:25 -07:00
KorPhaeron
eb39ca8e6e Kinetic Accelerator Mods (#19942)
* KA Mods

* Better examing

* Removes excess returns

* WHY indeed

* Updates projectiles properly

* Removes or replaces old hyper KA stuff

* Nerfs cooldown mod
2016-08-19 21:04:25 +12:00
Shadowlight213
5f10739385 Repaths satchels and lets angels equip them (#19371)
Repaths satchels so all the different ones are children of the normal satchel.
Allows angels to equip satchels since the satchels are on the side of the body instead of the back. Should help miners who find the potion out a bit.
2016-07-22 10:10:30 +12:00
KorPhaeron
74e451e7ce Sneaking Mission 2016-06-19 14:39:39 -05:00
blobbernaut
427bff2243 prevents capsules from breaching escape shuttle 2016-05-23 02:14:20 -04:00
bgobandit
b2ea93323d Runed metal no longer deletes girders when used on them. 2016-05-19 16:46:57 -04:00
Nerd Lord
ff984ec0cc cleanup 2016-05-08 11:46:26 -04:00
phil235
68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02: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
c95e64c17e Makes mine turfs less garbage 2016-03-21 03:00:51 -05: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
KorPhaeron
05c3b2d07b Test 2016-03-10 22:41:27 -06:00
duncathan
5bf31463da removes simulated turfs; adds space gas mixture for space 2016-03-10 17:27:01 -06:00
c0
a690abcf92 Plant Refactor: Seeds 2016-03-04 02:35:51 +03:00
Bjorn Neergaard
e4f3045487 Add spacecat
Fixes a revert in my last crate PR, spacecat added to asteroid
secret room (previously included a cat critter crate)
2016-02-10 09:15:03 -06:00
Bjorn Neergaard
4ef2667ff2 Rewrite supply packs/cargo orders 2016-02-07 04:45:55 -06:00
Bjorn Neergaard
ddab6823d3 Fix up crates
All shipable crates are proper children
All crates support a manifest
Crates rely on parent code shared with closets when possible
2016-02-07 01:20:37 -06:00
bear1ake
3f53c745aa Some fixes
filter.dm - fixes unrepoted bug with filters
asteriod.dm - fixes #13811
2016-01-16 04:34:28 +09:00
Bjorn Neergaard
34b717afb4 radio_controller -> SSradio, SSbp -> SSnpc 2015-12-04 22:25:24 -06:00
phil235
da0ba3659f Merge pull request #13239 from AnturK/animalbots
Simple Animal Bots - Beepsky strikes back.
2015-11-27 17:37:59 +01:00
AnturK
e36853d7c9 Convert bots to simple animals - Updated 7.0 2015-11-26 22:06:07 +01:00
bgobandit
92b5875e6b adds abandoned xeno outpost to mine room blacklist 2015-11-24 11:44:11 -05:00
bgobandit
f435f18d6b fixed gunhog's shit, added new KA/res to asteroid rooms, added mesons to mech scanner 2015-11-24 07:18:54 -05:00
bgobandit
2fd13edef2 Adds hivelord stabilizer. Fixes a bug. 2015-11-18 22:04:01 -05:00
Firecage
b2937bf315 Changes the operating table to be an actual table. 2015-11-08 22:09:35 +02:00
Shadowlight213
10afd56f2c Made asteroid treasure room soulstones usuable by anyone. 2015-10-10 13:44:38 -07:00
Jordie
d5a88d3f98 Merge pull request #10957 from Core0verload/surgery-organs-implants
Implants, Surgery and Organs rework: Phase 1
2015-08-04 21:45:02 +10:00
c0
04f7b3f2de Surgery, Implants and Organs rework: Phase 1 2015-07-31 22:18:31 +03:00
AnturK
23827eace8 Adds fire_act
Adds horn effect
Adds doll to asteroid room loot
2015-07-29 22:43:05 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Cheridan
2d998452db Merge pull request #9715 from Firecage/datumspaths
Changes alot of datum/ to /datum/, also includes other path types such as /obj/
2015-06-02 23:04:51 -05:00
Aranclanos
e7c0d7e95c Removes unsimulated turfs.
Moves shuttle turfs to paths under /turf/simulated/floor and /turf/simulated/wall
Players can now safely build on top of shuttle turfs
Fixes #1711
Adds several but not all paths for the different types of floor turfs, most of them in plasteel_floor.dm
The turf pathings are still in need of a deeper organization, but this is at least a start
2015-06-01 23:24:18 -03:00
Firecage
f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
Cheridan
884e9e3774 Day Who-Knows: Bar Gambling Expansion!
Space cash is stacks
Adds dealer table to map
2015-03-29 18:09:54 -05:00
paprka
88760896ad initial commit 2015-02-13 20:59:39 -08:00
xxalpha
a9c181bbcc Repath all non jetpack tank types to tank/internals
Repath all portable tanks to tank/internals, except jetpacks

Update ministation
2015-02-01 18:25:39 +00:00
Iamgoofball
f3398e58a9 Removes Star Trek chemistry and transfers us to Goon Chemistry. 2015-01-16 17:21:36 -08:00
Cuboos
8175bd91e0 Mining sound revamp, using realistic sounds now instead of reusing sound. Plus improved Taser sound. 2014-12-09 19:38:49 -08:00
tkdrg
ed4c03b099 Floor cleanup: Repaths /turf/simulated/floor to /turf/simulated/floor/plasteel
Repaths carpet and grass to /turf/simulated/floor/fancy/carpet and /turf/simulated/floor/fancy/grass
Cleans up a few floor procs
2014-11-12 22:50:32 -03:00
paprka
85de5f7cd5 initial commit for table overhaul 2014-11-01 23:57:01 -07:00
Cheridan
d98cf02a3f Adds smugger packs to mining room, replaces booby-prize beer keg.
Adds to uplink_item.dm
Updated code, latest sprites.
2014-09-27 19:59:25 -05:00
Razharas
f3ccaa5936 Merge conflicts fix 2014-03-03 05:42:31 +04:00
Ergovisavi
a4ffdf1cb7 Asteroid/Mining tweaks:
Adding mining GPS so miners can find each other more easily on the asteroid
Ore Redemption machine usability improved, also now only processes 10 ore per tick due to possible issues with mass processing of ores
Labor mineral rates edited to fall in line with the rest of the minerals, Labor stacker points increased to compensate
Treasure rooms should now spawn properly and start unlit, treasure items tweaked
Cargo points per plasma sheet significantly increased due to increased rarity
PACMAN generator made significantly more efficient to compensate for increased rarity of plasma, amount of plasma in engineering reduced as a result
Slight tweaks here and there of mining mobs in general
2014-02-25 06:03:17 -08:00
Razharas
b27d9c7396 Added RPED, some sprites and new power cell path
Your dreams of big part storage and fast machine part exchange came true
14 slot R&D part-only autoseeker/picker/dropper/exchager is in
Added different sprites for better capacitors and scanning modules
Changed the power cell type to be compatible with all this machine
changing faggotry
All sprites here are codersprites so ask nien/WJ for better ones if you
want
2014-02-24 05:14:43 +04:00
AlexanderUlanH
f31f7092c8 [MAP] Mining fixes and a remap
I don't even know what's going on oh god
2013-11-06 23:26:46 -05:00
Cheridan
09640f2e4f Minor change to asteroid turf generation. 2013-09-15 18:42:14 -05:00
Cheridan
0d927c4eed Mining treasure room overhaul!
-Maximum amount of rooms generated raised to 6.
-The size of the rooms is now random, and varies from tiny to quite large.
-Each room is assigned a theme, which determines the turfs it uses and the potential items it can contain.

http://i.imgur.com/THaBBNT.png
2013-05-21 19:43:13 -05:00
Pete Goodfellow
c87868b274 Moves /obj/effect/alien to /obj/structure/alien. Does not update the map.
Moves /obj/effect/alien/acid to /obj/effect/acid. Adds a new sprite for acid.
Standardises and updates text styling in code/game/objects/effects/aliens.dm.
2013-04-27 09:30:21 +10:00