cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-20 10:37:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
35,716 Commits 9 Branches 26 Tags
bb6d52d13d84c5e052d73f68e6e5c2a2d7244f78
Commit Graph
643 Commits
Author SHA1 Message Date
mwerezak 087a978d56 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown 
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2015-06-28 22:35:14 -04:00
PsiOmega f25e8a7a67 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm
 2015-06-26 20:28:47 +02:00
Neerti 462eaa834b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync 
Conflicts:
	.travis.yml
	code/modules/clothing/spacesuits/rig/modules/combat.dm
	code/modules/clothing/spacesuits/rig/modules/utility.dm
	code/modules/mob/living/silicon/ai/ai.dm
	icons/mob/rig_back.dmi
	polaris.dme
 2015-06-25 18:50:18 -04:00
Chinsky 5dda5021a3 Fixed a list being qdel'd when radio is deleted. 2015-06-25 23:04:04 +03:00
Zuhayr 48cf00ca54 Merge with dev-freeze. 2015-06-21 20:45:47 +09:30
Zuhayr ec5e05b9f1 Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465. 2015-06-21 18:08:26 +09:30
PsiOmegaDelta 1558bd5b75 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/toys.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers.dm
	html/changelogs/.all_changelog.yml
 2015-06-19 10:19:08 +02:00
PsiOmegaDelta f5da9f70c5 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	config/example/config.txt
 2015-06-19 09:55:48 +02:00
Ccomp5950 eea423ce0f Merge pull request #9857 from GinjaNinja32/bot 
Adds support for bots which use world.Export() for server-to-bot communication
 2015-06-18 13:46:50 -04:00
GinjaNinja32 8d232e9304 Adds support for bots which use world.Export() for server-to-bot communication 2015-06-18 18:34:55 +01:00
GinjaNinja32 a60b91fd1b Adds a new configuration value, SERVERURL, for the IRC bot to use if set 2015-06-17 10:00:35 +01:00
Kelenius 0071ed3f24 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/machinery/deployable.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/setup.dm
 2015-06-07 14:05:54 +03:00
Neerti f43bd102f2 Makes the code compile. 2015-06-05 22:58:51 -04:00
Neerti 2a45114038 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/5/2015_bay_merge 
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/datums/supplypacks.dm
	code/game/machinery/bluespacerelay.dm
	code/game/machinery/hologram.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/circuitboards/machinery/commsantenna.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/game/turfs/simulated/walls.dm
	code/global.dm
	code/modules/clothing/spacesuits/rig/suits/ert.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/designs.dm
	config/example/config.txt
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/rig_modules.dmi
	interface/interface.dm
	maps/exodus-3.dmm
	polaris.dme
 2015-06-05 22:11:15 -04:00
Chinsky e3f64178c8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into definecrusade 2015-06-05 13:24:03 +03:00
PsiOmegaDelta c3f0a46c19 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/storage/briefcase.dm
	html/changelogs/.all_changelog.yml
 2015-06-05 10:39:41 +02:00
Chinsky e5a8eb2dfc Actually renames 'going' var. 
Axes speed of light and procs that used it (but were not used by anything). More maths too, and max stack amounts, not used anywhere.
Ticks back stuff that was unticked for faster compile, whoops.
 2015-06-05 11:07:24 +03:00
PsiOmegaDelta 224cbb41bf Garbage/qdel changes. 
Moves atom/Destroy() into atom/movable/Destroy(). Is now a /tg/ copy-paste.
Means deleting turfs no longer wipes everything on that turf and that pulling is canceled.
qdel no longer willingly accepts lists.
 2015-06-04 19:32:05 +02:00
Zuhayr ebe62cefd8 Refactored random map generator system and added several terrain generators. 
Created a global list to track base turfs for explosions/shuttle moves.
Remaps the asteroid to be a moonlet. Tidies up some references to 'asteroid', removes moonbase from the accessible z level list.
 2015-06-03 04:36:19 +09:30
mwerezak 6b85a13de7 Merge remote-tracking branch 'upstream/dev' into chem-kinetics 
Conflicts:
	code/modules/reagents/Chemistry-Recipes.dm
 2015-05-30 17:25:57 -04:00
mwerezak 33487c76fa Implements reaction-over-time and reaction yield 2015-05-30 16:44:24 -04:00
PsiOmega d0232732d4 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/floodlight.dm
	code/game/objects/items/devices/suit_cooling.dm
	code/modules/organs/subtypes/diona.dm
	code/modules/paperwork/pen.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	html/changelogs/.all_changelog.yml
 2015-05-30 16:11:57 +02:00
PsiOmega 5e84bfa57c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/ert.dm
 2015-05-30 15:59:54 +02:00
Zuhayr 445056ba5f 'Fixes' #9395 2015-05-30 03:59:54 +09:30
PsiOmega 4ce737d87d Server build date and revision. 
Can now see the current compilation date and revision:
* In the Dream Daemon log output.
* By using the "Show Server Revision" client verb which also links you to the commit in question.
 2015-05-29 08:26:31 +02:00
Zuhayr 5ea78421ff Merge pull request #9408 from mwerezak/sm-eject 
Limits the ability of the SM to return to the station zlevel once ejected
 2015-05-28 11:35:39 +09:30
PsiOmega 98c585615e Inactivity process tweaks. 
Partially by request:
The inactive check process now respects client holder status and can be configured how long clients may remain inactive before being kicked.
 2015-05-26 09:04:26 +02:00
Kelenius 6d54e1c655 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/mob_grab.dm
 2015-05-21 17:00:50 +03:00
mwerezak 3c67c46442 Limits the ability of the SM to return to the station zlevel once ejected. 
Fixes #7900
 2015-05-21 01:02:30 -04:00
Chinsky a3a2c615de Merge pull request #9300 from PsiOmegaDelta/RoundStart 
Gamestart cleanup.
 2015-05-18 12:00:49 +03:00
Chinsky d374cd2681 Merge pull request #9292 from mwerezak/vital-areas 
Allows damage to accumulate past max_damage on vital organs
 2015-05-18 00:38:16 +03:00
Chinsky 8f50faf93c Merge pull request #9322 from Kelenius/ofVotesAndLinks 
Adds a voting link to the vote notification
 2015-05-17 23:44:52 +03:00
Kelenius 5fac67ea4e Adds a voting link to the vote notification 2015-05-17 13:33:49 +03:00
PsiOmega 5c646e8365 Limits wall processing. 2015-05-16 11:27:19 +02:00
PsiOmega 729a7a3ec9 Gamestart cleanup. 
* setup_economy() was called twice.
* Game state is set to playing just before creating characters, this ensures equipment such as headsets initialize properly().
* Removes the sleep in manifest creation. Prevents duplicate manifest entries from occurring if one joins within 4 seconds of round start.
 2015-05-16 10:59:45 +02:00
PsiOmega 163aab3753 Adds turf processing. 
Currently only used by walls. Radioactive walls now irradiate nearby mobs.
 2015-05-16 10:27:47 +02:00
mwerezak 413276a4c5 Allows damage to accumulate past max_damage on vital organs 
Fixes #9214
 2015-05-16 02:05:44 -04:00
Chinsky 8d83e8d452 Merge pull request #9202 from Zuhayr/customitems 
Custom items refactor.
 2015-05-14 21:47:04 +03:00
PsiOmega 7b67b44e38 Minor proc division. 
Attempts to discourage the creation of large procs.
 2015-05-13 17:38:23 +02:00
Chinsky 4108e82b6b Merge pull request #9208 from atlantiscze/rolling-brownouts 
Fixes dev power issues
 2015-05-13 18:09:16 +03:00
Zuhayr 3c10cc5852 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into customitems 2015-05-13 17:00:10 +09:30
Atlantiscze 616e9c773f Changes order of processing 
- Machinery is now processed before powernets, using data from previous tick. This fixes various UI issues with power related machinery, such as, SMES always showing output load of 100%. Otherwise has no changing effect on gameplay.
 2015-05-13 06:06:08 +02:00
Zuhayr a9f936fe42 Added exosuit customisation kits to cargo. 2015-05-13 11:20:54 +09:30
Chinsky ad67215b08 Merge pull request #9073 from PsiOmegaDelta/QDels 
Implementing Destroy():s
 2015-05-12 18:26:57 +03:00
PsiOmega 66ead991e7 Terminals, scrubbers, airlocks, and alarms get a Destroy() review. 2015-05-12 08:16:30 +02:00
Atlantiscze 51043bc84a Update 
- Creates a global list of items which have pwr_drain() called every powernet tick
- Makes powersink use this list
- Adds scheck
 2015-05-12 07:49:31 +02:00
Atlantiscze 37c16ff6e2 Merge powernet process into machinery process. 2015-05-12 05:33:55 +02:00
Mloc 16d50c645d new object-based lighting system 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 20:54:25 +01:00
Neerti 6906acf193 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two 
Conflicts:
	code/game/turfs/simulated/floor.dm
	icons/mob/back.dmi
	maps/exodus-3.dmm
	polaris.dme
 2015-05-10 04:21:37 -04:00
Kelenius 3fa79f8d51 Removes click cooldowns almost everywhere. 
Still have: doors, windoors, cameras, windows, grilles, blobs, resisting, alien stuff, mechas, spray bottles.
Setting changeNextMove is now responsibility of the item being attacked.
Adds a config option to eliminate click cooldowns completely. Intended to be used by devs.
 2015-05-09 17:27:19 +03:00