1854 Commits

Author	SHA1	Message	Date
Crazy Lemon	ebe28b3372	Merge pull request #6425 from Markolie/stackprogressbars ... Progress bars now stack vertically	2017-02-14 13:27:47 -08:00
Fox McCloud	300751373d	Merge pull request #6280 from fludd12/Grey-Wingdings ... Wingdings Revival^2	2017-02-13 06:26:56 -05:00
Markolie	c570ec4db2	Fix if() space	2017-02-13 00:02:33 +01:00
Markolie	40740d18ba	Code cleanup	2017-02-12 23:54:53 +01:00
Markolie	d0247fff2c	Progress bars now stack vertically. Also adds a bunch of lazy list helpers.	2017-02-12 23:51:50 +01:00
Markolie	3298f7edce	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates ... # Conflicts: # icons/obj/objects.dmi	2017-02-08 19:25:47 +01:00
Crazy Lemon	2d77a0ab4d	Merge pull request #6357 from Fox-McCloud/var-edit-fixes ... On Varedit Fixes	2017-02-07 20:01:32 -08:00
Crazy Lemon	d11dfa7a3b	Merge pull request #6343 from Fox-McCloud/reagent-tank-thingy ... Refactors Reagent Tanks--Adds High Capacity Water Tank	2017-02-07 19:58:28 -08:00
Crazy Lemon	685250501b	Merge pull request #6345 from Fox-McCloud/monkey-cube-refactor ... Monkey cube refactor	2017-02-07 19:53:58 -08:00
Markolie	835f68843a	Minor fixes, prevent ABSTRACT items from being summoned	2017-02-07 23:54:50 +01:00
Fox McCloud	93df42e792	Merge pull request #6342 from uraniummeltdown/clingmemory ... Changeling Absorb Memory Fix	2017-02-07 09:21:32 -05:00
Fox McCloud	6b10c515b1	Merge pull request #6341 from uraniummeltdown/crates ... Engineering and Science crates	2017-02-07 09:20:57 -05:00
Fox-McCloud	ad2468196e	On Varedit Fixes	2017-02-07 08:44:50 -05:00
Fox McCloud	fb926cb0d4	Merge pull request #6328 from uraniummeltdown/linglink ... Hivemind Link	2017-02-06 07:26:20 -05:00
Fox-McCloud	846ce475b2	Refactors Reagent Tanks--Adds High Capacity Water Tank	2017-02-05 13:58:24 -05:00
uraniummeltdown	d87603054b	say_log for mobs, fixed changeling absorb memory, changelings can now see past 8 messages of absorbed victim	2017-02-05 22:00:17 +04:00
uraniummeltdown	6f774c8e1e	added engi+engisec, electric engi from TG and sci+scisec crates from /vg/	2017-02-05 19:22:07 +04:00
Fox-McCloud	390f6768b3	Merge remote-tracking branch 'upstream/master' into botany-rework	2017-02-05 05:26:46 -05:00
Crazy Lemon	01c41cfb86	Merge pull request #6081 from Markolie/lavaland_megafauna ... Ports Lavaland megafauna	2017-02-05 00:27:40 -08:00
uraniummeltdown	2620f4e365	adds hivemind link to changelings, allows them to give a victim in > neckgrab hivemind comms for 3 minutes	2017-02-04 17:45:22 +04:00
fludd12	fe9f547da6	Moves spans to mind	2017-02-03 22:05:16 -05:00
Brian McGillivray	23139987a0	Tweak: Mr Chang's vending machine now refillable ... Changed the Mr Chang's vending machine to be able to be refiled with a new Chinese vending refill canister crate that can be ordered by Cargo.	2017-02-02 15:49:27 +00:00
Fox-McCloud	78a2518135	Monkey cube refactor, pre-map	2017-01-31 20:44:52 -05:00
Markolie	b55394ace3	Fix resource identifiers	2017-01-31 17:45:46 +01:00
Markolie	ab4703623c	Review changes	2017-01-27 17:46:38 +01:00
Fox-McCloud	cd93a21a97	nymphs and fixes	2017-01-26 03:38:25 -05:00
Fox-McCloud	3e87bd3370	more adjustments and fixes	2017-01-23 05:56:17 -05:00
Fox-McCloud	5c828db250	fixes, comfrey, and aloe	2017-01-23 05:25:42 -05:00
Fox-McCloud	7007f6bbdf	Merge remote-tracking branch 'upstream/master' into botany-rework	2017-01-23 01:01:09 -05:00
Fox-McCloud	104bfab759	sprite and code fixes	2017-01-22 23:25:56 -05:00
Markolie	d6276ae978	Tiger's comments	2017-01-22 19:15:26 +01:00
Fox-McCloud	706347fd84	even more work	2017-01-22 08:11:31 -05:00
Fox-McCloud	ea76990b7a	Botany Rework	2017-01-21 18:28:03 -05:00
Markolie	a50a3d59b9	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ... # Conflicts: # code/__DEFINES/is_helpers.dm # code/_globalvars/lists/objects.dm # code/game/machinery/turrets.dm # config/example/config.txt # goon/browserassets/css/browserOutput.css # icons/obj/library.dmi # icons/turf/floors.dmi	2017-01-20 23:43:35 +01:00
Mieszko Jędrzejczak	1b506aaf9f	Switches over to the new system	2017-01-17 13:57:07 +01:00
Markolie	f85e8fe551	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ... # Conflicts: # code/modules/mob/living/carbon/human/species/station.dm # icons/mob/screen_alert.dmi	2017-01-11 23:11:29 +01:00
Crazy Lemon	f1c3a7cd13	Merge pull request #6085 from Fox-McCloud/food-rework ... Food rework	2017-01-10 12:11:17 -08:00
Markolie	0adc370d55	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ... # Conflicts: # code/game/machinery/turrets.dm	2017-01-09 22:00:31 +01:00
Fox McCloud	9f40d013f9	Merge pull request #6099 from Kyep/offer_control_improvements ... Add playtime option to "offer control to ghosts"	2017-01-09 07:19:50 -05:00
Crazylemon64	ade630f864	Tightens the permissions on debug, DI panel, view variables	2017-01-08 22:51:38 -08:00
Kyep	d088aacaf1	Switches from being days based to playtime based	2017-01-07 17:59:36 -08:00
Kyep	65205ce4ca	Merge remote-tracking branch 'ParadiseSS13/master' into offer_control_improvements	2017-01-07 17:33:39 -08:00
Markolie	e2c60c2bdb	Add shapeshift spell, human_req/nonabstract_req support and make Ashdrake reward a shapeshift.	2017-01-06 17:02:38 +01:00
Markolie	f4c4bfe288	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ... # Conflicts: # code/__HELPERS/unsorted.dm # code/_globalvars/lists/objects.dm # code/controllers/verbs.dm # code/game/gamemodes/cult/ritual.dm # code/game/gamemodes/cult/runes.dm # code/game/objects/items/stacks/sheets/sheet_types.dm # code/modules/mob/spirit/mask/mask.dm # code/modules/mob/spirit/viewpoint.dm # icons/effects/96x96.dmi # icons/effects/effects.dmi # icons/mob/actions.dmi # icons/obj/weapons.dmi # icons/obj/wizard.dmi # icons/turf/floors.dmi	2017-01-06 16:36:46 +01:00
Aurorablade	113f2770e3	somethingsomethingcaffine	2017-01-06 06:33:12 -05:00
Aurorablade	7fb084d690	tries to address comments... ... and will get them wrong.	2017-01-05 22:07:21 -05:00
Markolie	8609157751	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ... # Conflicts: # _maps/map_files/cyberiad/cyberiad.dmm # code/_globalvars/mapping.dm # code/game/objects/effects/landmarks.dm	2016-12-30 00:17:56 +01:00
Aurorablade	98b7a89a17	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub ... # Conflicts: # code/game/machinery/doors/airlock.dm	2016-12-29 11:01:43 -05:00
Aurorablade	e25ddf8329	Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI	2016-12-24 00:18:40 -05:00
Markolie	01f2c85347	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ... # Conflicts: # code/__DEFINES/misc.dm # code/game/dna/genes/goon_powers.dm # code/game/dna/genes/vg_powers.dm # code/game/objects/effects/overlays.dm # code/game/objects/structures/crates_lockers/closets.dm # code/game/objects/structures/crates_lockers/closets/statue.dm # code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm # icons/mob/back.dmi # icons/obj/storage.dmi	2016-12-23 19:32:19 +01:00