65ba2d2800
Makes cloth not have force anymore. ( #18204 )
2016-06-04 01:23:29 -05:00
d89eb178c6
Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research
2016-05-30 18:33:55 +03:00
8aa135f470
fixes some of the crap maybe
2016-05-28 11:08:46 -05:00
65a0027979
Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research
2016-05-28 01:37:55 +03:00
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
907fc36e5c
Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research
2016-05-24 22:17:44 +03:00
b2ea93323d
Runed metal no longer deletes girders when used on them.
2016-05-19 16:46:57 -04:00
fe76e64641
Origin tech changes and some fixes
2016-05-17 20:57:01 +03:00
d8af0ac003
pixel projectiles dream
2016-05-16 21:26:20 -05:00
b7a7f7c470
2 small changes ( #17543 )
...
Survival Knife sprite and sandbag layer fix
2016-05-12 21:53:59 -05:00
a45ea3293f
Merge branch 'master' of https://github.com/tgstation/-tg-station into PixelProjectiles
2016-05-11 19:18:50 -07:00
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
7e5d0d69e3
The Cult Rises... Part II ( #17228 )
...
* Update cult_items.dm
* Update cult_structures.dm
* Update access.dm
* Update sheet_types.dm
* Update girders.dm
* Update walls_misc.dm
* Update cult_structures.dm
* New Items
* Structure improvements
* Unholy Update 2
* Spooky door
* Runed Metal creation
* Item fixes
* ABSOLUTE MADMAN
* ABSOLUTE MADMAN
* Final Tweaks
* Final Tweaks
* Final Tweaks
* Health adjustment
* Update cult_structures.dm
* clamp gone
* Dotting the i's and crossing the t's
* Grammar
* Capitalization, etc.
* time2mergebeg
* Added files via upload
* Added files via upload
* Self-reviewed PR, we're good to go now fam
* Self-reviewed PR, we're good to go now fam
* Self-reviewed PR, we're good to go now fam
* Self-reviewed PR, we're good to go now fam
* Self-reviewed PR, we're good to go now fam
* MERGE CONFLICT MAYMAYS
* Structures tweak
* Curse Improvements
* Icon update
* Phil Changes
* Phil Changes
* Phil Changes
* Phil Changes
* Phil Changes
* Phil change
* New York Phil-harmonic
* I-I like the original better anyway
* Spacesuits aren't THAT magical
* Can't have cultists getting TOO tricky eh
2016-05-07 23:07:10 -05:00
28a8387b17
initial commit
2016-05-07 14:39:17 -07:00
524a55a757
Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment
...
Conflicts:
code/datums/martial.dm
code/game/gamemodes/changeling/powers/fleshmend.dm
code/modules/mob/living/carbon/carbon.dm
2016-05-05 21:57:10 +02:00
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
528ce49e57
Adds dragon hide cloaks ( #17322 )
...
* dragon scales and cloak stuff
* Finishes shit with the ash drakes and the cloak
* woopsie
2016-05-04 00:43:31 -05:00
a7088757ed
Wall-mounted extinguisher cabinets are now constructable/deconstructable
2016-04-29 15:31:23 +03:00
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
cc59925d2e
Merge pull request #17108 from Bawhoppen/sandbagsz
...
Some sandbag changes
2016-04-27 20:23:21 -04:00
926e351fee
adds sinew restraints, changes sinew droprate.
2016-04-26 14:10:42 -07:00
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
0f0aa25976
fixes watcher sinew origin tech
2016-04-25 23:44:06 -06:00
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
322fc535ad
sandbags rah rah rah
2016-04-25 05:04:11 -05:00
556f611278
makes the path /animalhide
2016-04-24 22:07:51 -07:00
581a13975b
makes goliath plates stackable.
2016-04-24 21:27:48 -07:00
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
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
7b79508b17
bone ore and path REFACTOR.
2016-04-21 15:36:27 -07:00
e61fba82ea
Adds Bones and sinew to butchering results. Adds bone armor.
2016-04-21 12:58:15 -07:00
d671bf573c
Merge pull request #16858 from nullbear/Chemical-Explosives
...
Adds Chemical Explosives
2016-04-18 02:35:56 -05:00
76212a5fb9
Implements cloth stacks
2016-04-16 12:56:37 -07:00
82e39d6a85
Implements cloth stacks
2016-04-16 11:11:16 -07:00
df32979866
Adds Chemical Explosives
...
see changelog for details
2016-04-13 13:09:41 -07:00
dbae4b78e0
2 planks are needed to craft rolling pin
2016-04-11 22:41:03 +01:00
249a81dd15
Update sheet_types.dm
...
changed planks required from 10 to 1 to make rolling pin
2016-04-11 22:37:46 +01:00
b2eea7769f
Added rolling pin recipe datum to wooden plank
2016-04-11 21:40:44 +01:00
870208e7e4
Made ore boxes cost 4 wood instead of 20
2016-04-09 15:53:38 +01:00
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
497a4efc70
makes atmos_spawn_air() use the new gas string parser
2016-04-04 01:49:09 -06:00
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
af51a66e37
Adds sandbags
...
* sandbgs an stuff
* mmmm
* fucking sandbags
* okokok
* aaaaaaaaaaaaaaaaaaaaaah
2016-04-02 23:52:12 -04:00
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
e86cf0f280
praise the good lord, for the game finally compiles
2016-03-29 19:04:37 -06:00
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
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
cc62b89baf
Fix bundle
2016-03-26 15:15:31 -04:00
ab263f6d90
Abandoned Crates
2016-03-18 20:54:20 -05:00
8dfef3b793
fix
2016-03-12 15:07:33 +03:00
TechnoAlchemist
LatD
Lularian
Joan Lung
bgobandit
bawhoppen
paprika
Core0verload
Robustin
phil235
phil235
duncathan salt
Cheridan
RandomMarine
nullbear
erwgd
Jack Edge
Remie Richards
Xhuis
KorPhaeron