cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 21:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,232 Commits 94 Branches 23 Tags
TGSDMAPI
Commit Graph
1558 Commits
Author SHA1 Message Date
PsiOmega fb6ab23189 Makes the new initialization message use the proper method. 2015-08-10 17:46:38 +02:00
PsiOmega a710e77d46 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/controllers/master_controller.dm
	code/game/area/areas.dm
 2015-08-10 17:42:40 +02:00
mwerezak 12549b7e93 Fixes area power initialization 
Power channels start on when objects initialize, then are turned off and area machines notified in area initialization if an apc is not found.
 2015-08-09 19:58:37 -04:00
Kelenius 25eaeecb24 Optimizes reference finder 2015-08-07 09:28:29 +03:00
Kelenius 16ca8ca768 Optimizes garbage reference searcher 2015-08-06 10:48:14 +03:00
Kelenius cc83f35d72 Searches for references to hard-deleted objects 2015-08-05 18:10:41 +03:00
PsiOmegaDelta 5cbb703609 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/update_icons.dm
	code/modules/organs/organ.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/setup.dm
 2015-07-27 10:20:20 +02:00
PsiOmegaDelta 0ba7643217 Updates files as necessary to adhere to the new standard. 2015-07-27 09:32:51 +02:00
Zuhayr e0429af2f7 Added config option for initial brain organ health. 2015-07-27 15:33:54 +09:30
Zuhayr 4afa8a80f8 Readds config option to disable organ decay. 2015-07-27 15:30:38 +09:30
PsiOmega 2d24960603 Fixes #9894 some more. 
Ensures the vote sanity check is done first, before any change of vote counts.
 2015-07-26 10:45:05 +02:00
PsiOmegaDelta 617db485ee qdel/Destroy entries. 2015-07-21 14:22:01 +02:00
PsiOmega 34b0517578 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/admin/topic.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/nano/modules/atmos_control.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
 2015-07-17 23:19:34 +02:00
PsiOmega b4d15ceb6e Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/inventory.dm
 2015-07-17 23:09:24 +02:00
PsiOmega 4aa11441cc Fixes #10212. 
NSV Icarus is now NDV Icarus.
 2015-07-16 20:32:56 +02:00
PsiOmegaDelta c6f4f7fcee Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-07-12 15:14:43 +02:00
PsiOmegaDelta 7b3759c1f3 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/controllers/configuration.dm
	code/modules/admin/topic.dm
	config/example/config.txt
 2015-07-12 14:49:31 +02:00
PsiOmegaDelta 9b4d09c974 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/grenades/emgrenade.dm
	code/modules/clothing/spacesuits/rig/rig_attackby.dm
 2015-07-11 10:58:49 +02:00
Null Snapshot 168f823c35 Fixed up the things pointed out by Ccomp5950. 2015-07-09 22:19:05 -07:00
Null Snapshot a28d3cd9d1 Added new config variables for toggling moderator tempban permissions and maximum duration for bans. 2015-07-09 12:10:18 -07:00
GinjaNinja32 f3d09e092e Removes the approximations cheap_pythag and cheap_hypotenuse, since they're anything *but* cheap 2015-07-09 16:25:47 +01:00
Kelenius 879fc98a8c Fixes #9894 2015-07-09 11:50:42 +03:00
PsiOmegaDelta 5703fdfe85 Re-implements admin fun events as datums. 2015-07-07 11:19:01 +02:00
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
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
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